184 files changed, 49923 insertions, 37912 deletions

diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile
index 1cbdee2fe..127a8154b 100644
--- a/perl-install/install/Makefile
+++ b/perl-install/install/Makefile
@@ -15,15 +15,17 @@ all: xs
 clean xs:
 	make -C .. $@
 
+dist: tar
+
 tar:
 	rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION)
-	mkdir -p $(PRODUCT)-$(VERSION)
-	svn export -q -rBASE .. $(PRODUCT)-$(VERSION)/perl-install
-	svn export -q -rBASE ../../tools $(PRODUCT)-$(VERSION)/tools
-	svn export -q -rBASE ../../kernel $(PRODUCT)-$(VERSION)/kernel
-	cp ../../Makefile.config $(PRODUCT)-$(VERSION)/
+	mkdir -p $(PRODUCT)-$(VERSION)/perl-install/install/share/
+	(cd ../..; git archive HEAD kernel perl-install tools Makefile.config) | tar xC $(PRODUCT)-$(VERSION)
+	svn export svn://svn.mageia.org/svn/packages/cauldron/meta-task/current/SOURCES $(PRODUCT)-$(VERSION)/perl-install/install/share/meta-task
 	tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION)
 	rm -rf $(PRODUCT)-$(VERSION)
+	$(info $(PRODUCT)-$(VERSION).tar.xz is ready)
+	git tag $(VERSION)
 
 install:
 	$(MAKE) full_stage2
@@ -32,39 +34,47 @@ install:
 install_pms:
 	[ -d $(DEST) ] || ../../tools/mdkinst_stage2_tool --uncompress $(STAGE2_DEST)
 
-	for i in `perl -ne 's/sub (\w+?)_?(\(\))? {.*/$$1/ and print' commands.pm` sync; do ln -sf commands $(DEST)/usr/bin/$$i; done
+# commands implemented in perl:
+	for i in `perl -ne 's/sub (\w+?)_?(\(\))? {.*/$$1/ and print' commands.pm` sync; do if [ ! -x $(DEST)/usr/bin/$$i ]; then ln -sf commands $(DEST)/usr/bin/$$i; fi; done
 
+# install & clean perl modules:
 	install -d $(DESTREP4PMS)
 	cd .. ; for i in $(PMS); do \
 		dest=$(DESTREP4PMS)/`dirname $$i`; \
 		install -d $$dest; \
-		perl -pe 's/#[-+].*//; $$_ = "\n" if (/^=(head|begin)/ .. /^=cut/) || /use (diagnostics|strict|vars|warnings)/' $$i > $(DESTREP4PMS)/$$i; \
+		perl -pe 's/#[-+].*//; $$_ = "\n" if (/^=(back|begin|head|item|over|pod)/ .. /^=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
 
 get_needed_files: xs
+# generate installer system:
 	REP4PMS=$(REP4PMS) ../../tools/install-xml-file-list share/list.xml $(DEST)
+	mkdir -p $(DEST)/usr/sbin
+	/usr/lib/dracut/modules.d/30convertfs/convertfs.sh $(DEST)
 	chmod u-s -R $(DEST) # for mount/umount
 	share/generate-xlocales $(DEST)
 
-	mv -f $(DEST)/usr/$(LIB)/*.so* $(DEST)/$(LIB)
 	../../tools/simplify-drakx-modules $(DEST)/usr/*/*/*/utf8_heavy.pl
 
 	perl -I.. -Mlang -e 'symlink "UTF-8", "$(DEST)/usr/share/locale/$$_" foreach lang::list_langs()'
 
+# various needed soft links (eg for ndiswrapper):
 	perl -ane 'symlink "$$F[1]", "$(DEST)$$F[0]"' share/aliases
+# default shell:
 ifeq (ia64,$(ARCH))
 	ln -sf bash $(DEST)/bin/sh
 else
 	ln -sf ash $(DEST)/bin/sh
 endif
 
+# X11 font caches:
 	mkfontdir $(DEST)/usr/share/fonts
 	fc-cache -f $(DEST)/usr/share/fonts
 
+# drakx translations:
 	$(MAKE) -C ../share/po install SUDO= LOCALEDIR=$(DEST)/usr/share/locale_special
 	$(MAKE) -C help/po install SUDO= LOCALEDIR=$(DEST)/usr/share/locale_special
 	$(MAKE) -C share/po install SUDO= LOCALEDIR=$(DEST)/usr/share/locale_special
@@ -75,6 +85,7 @@ endif
 
 full_stage2:
 	$(MAKE) stage2
+	@if [ "$${DEBUG_INSTALL+xxx}" ]; then make dont_run_directly_stage2; else : ; fi
 	$(MAKE) compress
 
 compress:
@@ -82,14 +93,13 @@ compress:
 
 stage2:
 	rm -rf $(DEST)
-	mkdir -p $(DEST)
+	mkdir -p $(DEST)/usr
 	$(MAKE) get_needed_files 
 	$(MAKE) install_pms
 
 dont_run_directly_stage2:
 	[ -d $(DEST) ] || ../../tools/mdkinst_stage2_tool --uncompress $(STAGE2_DEST)
-	echo -e '#!/bin/sh\n\nexec /usr/bin/busybox sh' > $(DEST)/usr/bin/runinstall2.sh
-	chmod a+x $(DEST)/usr/bin/runinstall2.sh
+	install -m 755 share/runinstall2.sh share/gdb-inst $(DEST)/usr/bin/
 	ln -sf runinstall2.sh $(DEST)/usr/bin/runinstall2
 
 trace_stage2:
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4caea7afa..d331ceff3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,1692 @@
+Version 17.9 - 24 December 2015
+
+- include 60-evdev.rules instead of no more existing 60-keyboard.rules
+- silent gtk+ warnings about swrast driver
+
+Version 17.8 - 22 December 2015
+
+- recognize new kernel-4.3 drivers
+
+Version 17.7.1 - 17 December 2015
+
+- include one more file for new X.org wrapper (mga#17348)
+
+Version 17.7 - 17 December 2015
+
+- adapt to new X.org wrapper (mga#17348)
+
+Version 17.6 - 12 December 2015
+
+- drakx-in-chroot:
+  o fix running with xserver-1.18
+
+Version 17.5 - 8 december 2015
+
+- more substitution for task-plasma5
+- use sddm instead of kdm
+
+Version 17.4 - 6 December 2015
+
+- use task-plasma5-minimal instead of task-kde4-minimal
+
+Version 17.3 - 4 December 2015
+
+- recognize new kernel-4.3 drivers
+
+Version 17.2 - 26 November 2015
+
+- left background for Mageia 6 dev1
+
+Version 17.1 - 27 August 2015
+
+- recognize new kernel-4.1 drivers
+
+Version 17.0 - 24 June 2015
+
+- adapt to pango 1.37.x
+- adapt to perl-5.22
+- switch from evdev+synaptics to libinput driver
+
+Version 16.105 - 15 June 2015
+
+- really fix urpmi media when installing from USB (mga#5690)
+
+Version 16.104 - 13 June 2015
+
+- diskdrake:
+  o prevent errors when telling kernel to reread partition table
+
+Version 16.103 - 4 June 2015
+
+- partitioning wizard:
+  o only use current disk when auto partitioning, wiping disk,
+    using free space (mga#16055)
+
+Version 16.102 - 29 May 2015
+
+- diskdrake:
+  o ignore special 'Packard_Bell' and 'Push_Button_Reset' partitions (mga#15999)
+  o run udevadm settle after actions that trigger device reload (mga#15999)
+
+Version 16.101 - 25 May 2015
+
+- do not die if network cannot be started for updates (mga#8819),
+  just log the faillure and offer to either retry or abort
+- do not offer to add a CD-ROM as supplement media (mga#13671)
+- fix urpmi media when installing from USB (mga#5690)
+- locale setting
+  o fix reading back IM config (mga#15761)
+- partitioning:
+  o set pt_type according to fs_type before flag cases (mga#16029)
+
+Version 16.100 - 20 May 2015
+
+- add online media at installation end (mga#8819)
+
+Version 16.99 - 20 May 2015
+
+- bootloader:
+  o do not detect grub2 on UEFI when there's no bootloader
+  o fix default grub2 kernel parameters (mga#15984)
+- partitioning:
+  o display cosmetics when reading back GPT partitions
+  o fix mnt point for FAT partitions on GTP (mga#15987)
+  o set the proper GUID for FAT partitions on GPT
+- don't try to install non existant scim-googlepinyin (mga#6681)
+
+Version 16.97 - 18 May 2015
+
+(just to be sure draklive-install fix for mga15257 doesn't break anything)
+
+Version 16.96 - 17 May 2015
+
+- partitioning:
+  o fix regression refusing FAT for ESP (mga#15962)
+
+Version 16.95 - 14 May 2015
+
+- better dialog title (mga#9648)
+- partitioning:
+  o fix a crash after "insufficient space" error (mga#15919)
+
+Version 16.93 - 9 May 2015
+
+- bootloader:
+  o do use vga value for grub2
+  o fix setting default grub2 entry
+
+Version 16.92 - 9 May 2015
+
+- bootloader:
+  o add a dedicate step for grub2 (mga#9627)
+  o always log update-grub2 output (mga#15857)
+  o backup grub2 files before configuring
+- log grub2 install.sh in report.bug like for grub (mga#15857)
+- networking:
+  o recognize r8723bs (mga#15874)
+- partitioning:
+  o do not set noauto for /boot/EFI (mga#15627)
+
+Version 16.91 - 3 May 2015
+
+- final left-background
+
+Version 16.90 - 28 April 2015
+
+- localedrake:
+  o write input methods to /etc/locale.conf (mga#15464)
+- run vgchange before updating the list of LVMs, not after, and even if not
+  in install (should help with mga#7578).
+
+Version 16.89 - 25 April 2015
+
+- Ignore special partitions on mmc (mga#15759)
+
+Version 16.87 - 21 April 2015
+
+- partitioning:
+  o improve the display box (mga#15728)
+
+Version 16.86 - 20 April 2015
+
+- bootloader:
+  o dont override 'splash' and/or 'quiet' when adding 'noiswmd' (mga#15666)
+- partitioning:
+  o use the windows partition with the most available space on current
+    disk, not the last one across all disks (mga#15589)
+  o suggest up to 20GB/20% of the windows partition (whichever is larger),
+    previously 6GB/10% (mga#15589)
+  o hide empty space < 2MB, we have such holes due to alignment (mga#15733)
+- speed up reading of flags from GPT partition table (mga#15621).
+
+Version 16.84 - 14 April 2015
+
+- bootloader config:
+  o do not pass useless parameters to grub2 under UEFI (mga#15692)
+  o fix kernel booting in blind mode (mga#15291)
+
+Version 16.83 - 13 April 2015
+
+- enable firmware raids with dmraid/kpartx like we do on
+  live medias and on fully installed systems
+
+Version 16.82 - 13 April 2015
+
+- partionning:
+  o detect Lenovo recovery & 'SYSTEM_DRV' as such (mga#1371)
+  o do add a ESP if it was removed by "Clear All"
+  o ignore ESP for "use free space on MS"
+- bootloader config:
+  o default to GRUB_DISABLE_RECOVERY=falss for 'failsafe' entry (mga#15675)
+
+Version 16.81 - 12 April 2015
+
+- add kpartx for dmraid activation
+- fix upgrade when package's in several media (mga#15350)
+  (need URPM-5.06 too)
+- support loading patches from NTFS USB keys
+- partionning:
+  o don't guess a drive letter for ESP partitions
+
+Version 16.80 - 9 April 2015
+
+- bootloader config:
+  o check there's still some place on /boot with grub2 too
+  o generate core.img for UEFI
+  o fix detecting grub2 on UEFI
+  o write /boot/grub2/install.sh like for grub instead of drakboot.conf
+- log grub2 config in report.bug like for grub/lilo
+- partitionning:
+  o don't guess a drive letter for recovery partitions (mga15636)
+
+Version 16.79 - 7 April 2015
+
+- bootloader config:
+  o keep vga= parameter when switching to grub2 (mga#9888)
+
+Version 16.78 - 7 April 2015
+
+- bootloader:
+  o fix installing grub2 on MBR (mga#15640)
+    (regression introduced in 16.76)
+
+Version 16.77 - 7 April 2015
+
+- bootloader:
+  o add 'noiswmd' to kernel command line to manage isw_ bios
+    fakeraids with dmraid for now (instead of mdadm) (mga#11289, mga#14330)
+  o allow btrfs for / without separate /boot with grub2 (mga#15374)
+- partitioning wizard:
+  o do not offer to select RAID as it result in a crash (mga#5800)
+
+Version 16.76 - 3 April 2015
+
+- bootloader config:
+  o log grub2-install failures (mga#15439)
+- partitionning:
+  o log fdisk -l output before/after partitionning
+  o really try to detect recovery partitions on GPT
+
+Version 16.75 - 30 March 2015
+
+- partitionning:
+  o better fix for fail to read too corrupted partition table
+  o fix getting ESP with "use free space":
+    make sure to not override /boot/EFI mount point with /media/win_X
+  o make sure to check for existing ESP on all disks
+  o relax checks for ESP
+  o try to detect recovery partitions on GPT
+
+Version 16.74 - 27 March 2015
+
+- GPT partitionning:
+  o fix retrieving ntfs partitions as ntfs-3g instead of ntfs
+  o really fix retrieving swap partition type
+
+Version 16.73 - 27 March 2015
+
+- GPT partitionning:
+  o fix creating RAID devices (mga#15400)
+    (regression from 16.33)
+  o fix "I cannot read the partition table of device XXX, it is too corrupted"
+  o fix retrieving LVM/RAID/swap partition type
+  o fix retrieving ntfs partitions as ntfs-3g instead of ntfs
+  o fix tagging lvm/raid as "linux filesystem"
+  o fix tagging ntfs-3g as "linux filesystem"
+  o fix tagging swap as "linux filesystem"
+- tell users to ignore Gtk3 warnings
+
+Version 16.72 - 26 March 2015
+
+- fix a crash in auto install (mga#15573)
+
+Version 16.71 - 25 March 2015
+
+- bump max_nb() to 131 to cover mdadm managed imsm and ddf1 bios
+  fakeraids (containers defaults to >= 127 and partitions <=126)
+- partitionning:
+  o fix retrieving ESP partition type on GPT (mga#15366)
+  o log which GPT partition we fail to add/del
+  o set proper GUID to ESP partitions with GPT layout
+- pre-install grub2-efi on UEFI
+
+Version 16.69 - 20 March 2015
+
+- efi partitioning fixes from tv
+- diskdrake & package install gtk fixes from Martin Whitaker
+
+Version 16.68 - 17 March 2015
+
+- fix mis-detecting some mobile broadband modems (mga#12492)
+- add 'deploops' option for debugging (mga#15350)
+- log mkinitrd faillures (mga#9201)
+
+Version 16.67 - 5 March 2015
+
+- auto_install:
+  o ignore firmwares within draklive
+  o log step errors
+- drakx-in-chroot:
+  o unbreak draklive
+
+Version 16.66 - 5 March 2015
+
+- diskdrake:
+  o add "nofail" option to "foreign" mountpoints to avoid unwanted recovery mode (#10179)
+
+Version 16.65 - 27 February 2015
+
+- Mageia 5 RC
+- include udev rule for Synaptics
+
+Version 16.64 - 27 February 2015
+
+- partitioning:
+  o add missing button icons (mga#15264)
+
+Version 16.63 - 27 February 2015
+
+- partitioning:
+  o fix too wide buttons (mga#12422, mga#13471, mga#14839, mga#15379)
+
+Version 16.62 - 19 February 2015
+
+- partitioning (mga#12422, mga#11988, mga#14839, mga#15272, mga#15264):
+  o use an horizontal scrolling bar when needed
+  o use a vertical scrolling bar when needed (mga#15272)
+  o workaround too wide togglebuttons with empty label with gtk+3 and/or Adwaita
+
+Version 16.61 - 18 February 2015
+
+- ensure we install radeon-firmware too if needed (mga#15203)
+
+Version 16.60 - 18 February 2015
+
+- ensure we install kernel-firmware-nonfree if needed (mga#15203)
+
+Version 16.59 - 18 February 2015
+
+- bug:
+  o display a nicer message when no removable medium is found (mga#14435)
+
+Version 16.57 - 11 February 2015
+
+- fix taking screenshots on UEFI 24bit bpp framebuffer (mga#13684)
+
+Version 16.55 - 9 February 2015
+
+- drakclock: Ensure that /etc/localtime is a symlink (mga#14888)
+- users: Make sure to restart accounts-daemon after adding users (mga#15113)
+- finish-install: Ensure i18n settings are loaded
+- Create a symlink instead a hard copy to localtime see issue #14888
+- i18n: Write the desired console font to /etc/vconsole.conf
+- i18n: Use the x-distro /etc/locale.conf file instead of /etc/sysconfig/i18n
+- drakedm: Don't run ancient dm init script (which no longer exists)
+- Update traslations
+
+Version 16.54 - 6 February 2015
+
+- fix left background size
+
+Version 16.53 - 6 February 2015
+
+- switch from oxygen-gtk to Adwaita theme
+  o remove oxygen-gtk
+  o add missing icons (mga#13673, mga#14355, mga#14840, mga#14844)
+  o add libpixbufloader-svg.so for Adwaita svg icons
+  o add gtk.css
+
+Version 16.52 - 5 February 2015
+
+- default to GPT on disks larger than 4TB, not LVM
+- fix GPT initialization on empty disk
+- fix failure to delete partitions after switching to GPT
+- fix stage2 loading graphical installer in efi mode
+
+Version 16.51 - 3 February 2015
+
+- Mageia 5 beta 3 
+- recognize new kernel-3.19 drivers
+
+Version 16.50 - 9 January 2015
+
+- initial uefi support
+
+Version 16.49 - 31 December 2014
+
+- translation updates
+- refer to MageiaWelcome instead of to something we do not have (mga#10901)
+- drakx-in-chroot:
+  o pre-create /dev/null & co before mounting devtmpfs
+- recognize new kernel-3.18 drivers (mga#14799)
+
+Version 16.48 - 16 December 2014
+
+- Mageia 5 artwork integration (with beta2 mention on left-background)
+- do not load hyper-v modules (already done by udev in stage1)
+
+Version 16.47 - 5 December 2014
+
+- do not crash loading stage2 in Virtual PC (mga#14117)
+- bootloader config:
+  o do not crash if fstab contains a bind mount on a file (mga#14657)
+
+Version 16.45 - 26 October 2014
+
+- drakx-in-chroot:
+  o pre-create /dev/null & co again (for draklive)
+- fix selecting of uneeded locales (mga#3723)
+
+Version 16.44 - 23 October 2014
+
+- drakx-in-chroot:
+  o document --stage2-update in --help
+  o mount /dev -o ro
+  o try harder to umount everything when sg went havroc
+
+Version 16.43 - 20 October 2014
+
+- drakx-in-chroot:
+  o adapt to the fact that stage2 expects a /dev fully populated by udev
+- package installation:
+  o adapt to URPM-5
+  o rename "no_suggests" option as "no_recommends"
+
+Version 16.42 - 18 September 2014
+
+- only allow GRUB2 when booting on btrfs
+
+Version 16.41 - 31 August 2014
+
+- adapt to latest systemd
+- allow /boot on btrfs
+- recognize new kernel-3.17 drivers
+
+Version 16.40 - 22 August 2014
+
+- adwaita-gtk3-theme no longer provides a settings.ini file
+- log X.org server logs when it fails to start up (mga#13471, ...)
+- recognize hyper-v paravirtual network driver
+
+Version 16.39 - 17 August 2014
+
+- recognize new kernel-3.16 drivers
+
+Version 16.38 - 22 July 2014
+
+- Mageia 5 alpha 2 left background
+
+Version 16.37 - 3 July 2014
+
+- fix /etc/fstab writing (mga#13114, also reported by Joseph Wang)
+- partitioning:
+  o improve fs sorting in combo box (mga#13640)
+
+Version 16.36 - 1 July 2014
+
+- hide /boot/efi check for now (mga#13638)
+
+Version 16.35 - 29 June 2014
+
+- Mageia 5 alpha 1 left  background
+- let udev handle floppies
+
+Version 16.33 - 18 June 2014
+
+- stop creating some /dev entries that are managed by udev
+
+Version 16.32 - 15 June 2014
+
+- include platform driver autoload udev rules
+- recognize new kernel-3.15 drivers
+
+Version 16.31.1 - 6 June 2014
+
+- include udev rule for VMmouse
+
+Version 16.31 - 6 June 2014
+
+- xorg config:
+  o rely on evdev/udev for input devices
+  o Wacom tablets should work better
+    (we now load the wacom driver again)
+  o Synaptics touchpads should now work during install (mga#11524)
+
+Version 16.30 - 4 June 2014
+
+- adapt to perl-5.20
+- add some POD documentation
+- do not unavailable kernel-xbox
+- drop (broken) support for Alpha, PPC, Sparc & IA64
+- locale setting
+  o stop configuring HAL
+  o update locales list
+
+Version 16.29 -  3 May 2014
+
+- gnome-icon-theme is now adwaita-icon-theme
+
+Version 16.28 - 28 April 2014
+
+- recognize new kernel-3.14 drivers
+
+Version 16.27 - 18 February 2014
+
+- fix crash when choosing a RTL language (mga#12793)
+- Ensure uid/gid extraction works when adding users via summary page
+  (fixes chown'ing user to root when adding existing user on upgrade mga#12375)
+
+Version 16.26.6 - 23 January 2014
+
+- fix hidden icon in individual package selection (mga#12397)
+
+Version 16.26.5 - 22 January 2014
+
+- release notes dialog:
+  o fix untranslated button
+
+Version 16.26.4 - 22 January 2014
+
+- debug image:
+  o add a warning about QWERTY keyboard
+- help dialogs:
+  o do warn on first screenshot (mga#11176)
+  o fix lost help screenshots (mga#11176)
+
+Version 16.26.3 - 21 January 2014
+
+- help dialogs:
+  o do not warn if a screenshot already has been taked (mga#11176)
+
+Version 16.26.2 - 20 January 2014
+
+- left background for final release of Mageia 4
+
+Version 16.26.1 - 20 January 2014
+
+- partitioning:
+  o increase back minimum partition width for Oxygen (mga#11977)
+
+Version 16.26 - 20 January 2014
+
+- fix detecting if basesystem is installed (mga#10722)
+  thus fixing "basesystem package not selected"
+- partitioning:
+  o fix sizing partition widgets
+  o fix not moving window (mga#11790, mga#11988, mga#11977)
+  o revert minimum partition width to its pre-gtk3 value
+  o show labels on partition buttons
+
+Version 16.25 - 19 January 2014
+
+- add Mageia 4 desktop images
+
+Version 16.24 - 18 January 2014
+
+- help dialogs:
+  o make screenshots work (mga#11176)
+  o fix untranslated button & title (mga#9828)
+
+Version 16.23 - 16 January 2014
+
+- partitioning:
+  o do not show labels on partition buttons (mga#11988)
+
+Version 16.22 - 15 January 2014
+
+- partitioning:
+  o fix "No GSettings schemas are installed on the system" error when
+    inspecting partitions (mga#12279)
+- services:
+  o use --no-block with chkconfig and systemctl enable to prevent systemd reload
+    and potential crash (especially during first/live boot)
+
+Version 16.21 - 13 January 2014
+
+- partitioning:
+  o do not propose check bad blocks for btrfs (Manuel Hiebel, mga#10116)
+  o increase minimum partition width for Oxygen (mga#11977)
+    (if not enough, we will disable labels on partitions buttons again)
+- revert back to matchbox instead of mutter as it doesn't fix
+  diskdrake issues (mga#11977)
+  (thus fixing missing window decorations (mga#12218))
+
+Version 16.20 - 6 January 2014
+
+- Mageia 4 artwork
+
+Version 16.19 - 4 January 2014
+
+- Mageia 4 RC left background
+
+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
+
+Version 15.68 - 14 October 2013
+
+- drop /etc/termcap as it's no longer part of our build
+- make urpmi install check more reliable (polkit related path change mga#11125)
+- recognize new kernel-3.12 drivers
+
+Version 15.67 - 10 October 2013
+
+- log when user reject applying updates (mga#11319)
+- recognize new kernel-3.11 drivers
+
+Version 15.66 - 3 October 2013
+
+- include another network interface name udev rule (mga#10947)
+- diskdrake:
+  o enable to format already formated btrfs partitions (mga#11256)
+
+Version 15.65 - 28 September 2013
+
+- mageia 4 alpha 3 left background
+- fix detecting some soft RAID (mga#11139 and the like)
+
+Version 15.64 - 4 September 2013
+
+- rebuild
+
+Version 15.63 - 4 September 2013
+
+- revert multi selection for desktops
+
+Version 15.62 - 3 September 2013
+
+- Mageia 4 alpha 2 left background
+- updated translations for desktop install
+- add Independently install Desktop environments
+- install open-vm-tools on VMware hypervisor
+
+Version 15.61 - 8 August 2013
+
+- include network interface name udev rule (mga#10947)
+
+Version 15.60 - 4 August 2013
+
+- Mageia 4 alpha 1 left background
+
+Version 15.59 - 4 August 2013
+
+- add missing re.so for utf8_heavy.pl (mga#10893)
+- detect wifi cards managed by ssb driver (mga#9378)
+
+Version 15.58 - 19 July 2013
+
+- fix a lang pixmap (mga#10795)
+
+Version 15.57 - 16 July 2013
+
+- adapt to latest btrfs utils for resizing
+
+Version 15.56 - 16 July 2013
+
+- bootloader:
+  o fix displaying need to install acpi* packages when they're already installed
+  o read/save choosen default entry
+- detect wifi cards managed by bcma driver (mga#9378)
+- detect new kernel-3.10 drivers
+
+Version 15.54 - 17 May 2013
+
+- do not enable legacy sysvinit scripts that no longer exist (mga#10084)
+- do not enable to pick xguest (mga#9750)
+- fix offering to install shorewall & shorewall-ipv6 when already installed
+- media step:
+  o hint that nonfree is needed if a driver needs a nonfree firmware
+  o preselect nonfree if needed
+
+Version 15.52 - 15 May 2013
+
+- fix displaying release notes while installing (mga#10087)
+
+Version 15.51 - 13 May 2013
+
+- drop support for fetching release-notes.ARCH.html
+- enable Nonfree/Tainted repositories when adding update media if a
+  package having a matching name is installed (similar to #8379)
+- detect_devices: check for phy80211 sysfs directory as well to detect
+  wireless devices
+
+Version 15.49 - 2 May 2013
+
+- fix displaying ads (mga#9939)
+
+Version 15.48 - 1 May 2013
+
+- include mount options in auto_inst.pl
+- install 'basesystem-minimal' instead of 'basesystem' prior to add extra media
+  thus fixing "basesystem package not selected" (mga#9611)
+- make xdm installation automatic in auto_inst mode (mga#9875)
+
+Version 15.47 - 30 April 2013
+
+- include more partition fields in auto_inst.pl (mga#9784)
+- skip comments in /etc/crypttab (Colin, mga#9905)
+- services:
+  o list 'shorewall-ipv6' along 'shorewall'
+
+Version 15.45 - 27 april 2013
+
+- fix doble logging of 'filesystem' installation (mga#7758)
+- install shorewall-ipv6 along shorewall (mga#9401)
+- bootloader:
+  o try harder to get a label for other OSes (mga#9849,9681)
+- partionning:
+  o only allow 'acl' option for extX & reiserfs (mga#9884)
+
+Version 15.44 - 23 april 2013
+
+- partionning:
+  o fix a crash when reloading partition table (mga#9838)
+  o fix a crash when trying to create a encrypted LVM partition (mga#9837)
+
+Version 15.43 - 22 april 2013
+
+- prepare final release: left background
+
+Version 15.42 - 21 April 2013
+
+- partionning (mga#5661):
+  o ensure LVMs on top of dmcrypt are activated after unlocking
+  o fix UI redraw issue after unlocking dmcrypt partition
+
+Version 15.41 - 21 April 2013
+
+- add support for new help
+- updated translations
+
+Version 15.40 - 19 April 2013
+
+- authentication:
+  o 'nss-pam-ldapd' obsoletes 'pam_ldap' (mga#9769)
+- partionning (mga#5661):
+  o fix losing crypt key when detecting LVMs on top of dmcrypt
+  o fix losing crypt key when re-reading partition tables
+
+Version 15.39 - 15 April 2013
+
+- bump min size for spliting /home fs (Eugeni, mga#3189):
+  o from 8 to 12Gb if simple partionning
+  o from 7 to 10Gb if /usr is split or for servers
+
+Version 15.38 - 14 April 2013
+
+- Mageia 3 RC banner
+
+Version 15.37 - 9 April 2013
+
+- library:
+  o fix detecting some USB devices due to not reporting their class (mga#9674)
+- partitioning:
+  o allow to choose btrfs in normal mode (mga#65)
+
+Version 15.36 - 6 April 2013
+
+- bind mount /run in chroot, thus fixing dracut runs (Dave Hodgins, mga#9213)
+- bootloader:
+  o fix other Mga OS names in menu (mga#8710)
+
+Version 15.35 - 5 April 2013
+
+- bootloader:
+  o assume grub2.cfg is UTF-8 encoded
+  o read back more conf from grub2
+  o set entries type when reading back grub2 conf, thus fixing
+    switching back to grub-legacy (mga#9563)
+- fix finding translated help (mga#9619)
+
+Version 15.34 - 4 April 2013
+
+- force loading NSS modules (mga#9326)
+- log ignored dmraid devices (might help mga#9467)
+- drakx-in-chroot:
+  o always copy /etc/resolv.conf again
+
+Version 15.33 - 4 April 2013
+
+- drakx-in-chroot:
+  o do not copy /etc/resolv.conf in chroot if not using either remote
+    display or remote repository (thus fixing goup lookups, mga#9326)
+
+Version 15.32 - 31 March 2013
+
+- fix detecting Xen hard disks (mga#9546)
+
+Version 15.31 - 25 March 2013
+
+- recognize more webcam & bluetooth devices (might help mga#5841)
+
+Version 15.30 - 25 March 2013
+
+- Mageia 3 new design
+
+Version 15.29 - 22 March 2013
+
+- Mageia 3 beta 4 background
+
+Version 15.28 - 21 March 2013
+
+- do not disable module autoloading (mga#9428)
+- bootloader-config:
+  o do not build initrd if no bootloader is detected and
+    --no-initd argument is supplied
+- authentication:
+  o install nss-pam-ldapd instead of nss_ldap (mga#9375)
+- partitioning:
+  o actually preserve UUID when formatting (mga#9428)
+
+Version 15.27 - 12 March 2013
+
+- bootloader:
+  o install grub2-efi instead of grub2 if using UEFI (mga#8886)
+- fix permissions of help displayer (mga#9340)
+- fix dialogs popup with drakx-in-chroot
+
+Version 15.26 - 5 March 2013
+
+- include display_installer_help
+- show all errors at once at end of installation
+
+Version 15.25 - 5 March 2013
+
+- fork displaying help, thus workarounding a webkit segfault (mga#9124)
+- prevent displaying twice release notes
+
+Version 15.24.1 - 2 March 2013
+
+- rebuild with updated list_modules
+
+Version 15.24 - 28 February 2013
+
+- bootloader:
+  o allow installing grub2 on a partition (mga#8742)
+  o try harder not to have duplicate stuff on grub2 cmd line
+- do not put entry for CD/DVD in /etc/fstab (mga#7657)
+
+Version 15.23 - 27 February 2013
+
+- bootloader:
+  o fix detecting grub2 if there's a remaining grub-legacy signature
+  o read more of grub2 config
+  o read & save timeout value (mga#8850)
+  o set default parameters in grub2 config (mga#9177)
+- do not attempt to use gurpmi.addmedia or gurpmi if in text mode
+
+Version 15.22 - 26 February 2013
+
+- Mageia 3 beta 3 left background
+
+Version 15.21 - 26 February 2013
+
+- summary:
+  o prevent installing grub2 somewhere else than MBR
+  o read & write /boot/grub2/drakboot.conf
+  o suggests MBR by default for grub2 too (Manuel Hiebel, #8851)
+- always bypass blkid cache (the cache only includes a subset of the data we need)
+
+Version 15.20 - 21 January 2013
+
+- use modprobe instead of insmod (mga#8676)
+
+Version 15.19 - 14 January 2013
+
+- Mageia 3 beta 2 left background
+
+Version 15.18 - 5 January 2013
+
+- include more utils for raid (mga#8484)
+
+Version 15.17 - 28 December 2012
+
+- do not bypass blkid cache
+- include kmod's modprobe
+- drakx-in-chroot:
+  o export blkid cache
+
+Version 15.16 - 28 December 2012
+
+- adapt to new help layout (mga#5634)
+
+Version 15.15 - 24 December 2012
+
+- drakx-in-chroot:
+  o add --strace option, enabling to pinpoint missing modules
+- include missing module for upcasing UTF-8 characters (mga#8475)
+- media step:
+  o prevent selecting an update medium without its parent medium
+
+Version 15.14 - 17 December 2012
+
+- ugtk2: use new exceptions management
+- fix installing grub2 from live session (blino)
+
+Version 15.13 - 15 December 2012
+
+- fix checking grub2 installation (mga#8390)
+
+Version 15.12 - 14 December 2012
+
+- "enhance" fake grub2 conf reading (mga#8366)
+- time steps in logs
+- media step:
+  o fix dialogs title
+  o show which media are disabled when offering to pick supplementary ones
+
+Version 15.11 - 13 December 2012
+
+- install grub2 if needed
+- media choice step:
+  o display tooltips describing media
+
+Version 15.10 - 11 December 2012
+
+- revert rosa crap that breaks generating initrd (mga#8357)
+
+Version 15.9 - 11 December 2012
+
+- fix network set up for adding network media if not up by stage1
+  (aka DVD/CD case, mga#8282)
+- partitioning:
+  o if a partition has been manually formated, don't offer to format
+    it again (mga#7822)
+
+Version 15.8 - 11 December 2012
+
+- fix installing basesystem prior to adding a supplementary network
+  medium
+
+Version 15.7 - 10 December 2012
+
+- media choice step:
+  o blacklist unwanted media instead  of whitelisting wanted ones
+    (fix dual cd where media names are not the regular ones)
+  o no media is a critical error
+- updates step:
+  o add all media instead of only update ones (mga#7959)
+
+Version 15.6 - 10 December 2012
+
+- language choise:
+  o change title of of "Multiple languages" dialog box from "Please Choose A
+    Language To Use" to "Select Additional Languages" (mga#7648)
+- set font familly & size system wide, thus fixing font size in gurpmi
+  & release notes (mga#67)
+
+Version 15.5 - 10 December 2012
+
+- recognize new drivers:
+  o input: hid-sensor-hub
+  o PHY: at803x
+
+Version 15.4 - 9 December 2012
+
+- put grub-legacy before grub2
+
+Version 15.2 - 7 December 2012
+
+- add fake gru2 conf reading
+- skip media screen in auto install
+
+Version 15.1 - 7 December 2012
+
+- add basic support for grub2 (mga#416)
+  (based on rosa work but fixed and completed)
+
+Version 15.0 - 6 December 2012
+
+- enable to skip keyboard step with keyboard option
+- enable to enable other media
+  (such as 'nonfree', 'tainted' which are disabled by default)
+
+Version 14.52 - 4 December 2012
+
+- Mageia 3 beta 1 left background
+- fix missing command links (mga#8289)
+- fix initializing urpm object (mga#8160)
+- fix offering "selecting individual packages" when pressing "previous" after
+  selecting package groups
+
+Version 14.51 - 16 November 2012
+
+- retrieve package descriptions from XML meta-data instead of from huge hdlists
+  (fix not displaying packages description in network installs) (mga#549)
+- fix a crash when pressing "previous" after selecting package groups
+
+Version 14.50.1 - 15 November 2012
+
+- include Parse::EDID for monitor-parse-edid (mga#8076)
+
+Version 14.50 - 6 November 2012
+
+- prevent a horizontal scrollbar to appear in some dialogs (mga#7374)
+
+Version 14.49 - 3 November 2012
+
+- Mageia 3 alpha 3 banner
+- prefer real binaries over the lightweight perl wrappers
+- convert filesystem for usrmove during upgrades
+- show a 'please wait' dialog while processing usrmove
+
+Version 14.48 - 22 October 2012
+
+- fix detecting if udev is already running
+- include FIRMWARE packages from Cards+ in detected graphical drivers,
+  to install radeon-firmware during install (#6438, #7641)
+- properly generate stage2 with a usrmove-esque fs layout
+
+Version 14.47 - 12 October 2012
+
+- offer resizing NTFS again (broken by ntfsprogs -> ntfs-3g switch)
+
+Version 14.46.3 - 5 October 2012
+
+- load 'microcode' asynchronously, preventing big wait when not supported
+  (mga#7671)
+
+Version 14.46.2 - 3 October 2012
+
+- adapt to latest dash-static
+- fix comment in license text
+
+Version 14.46.1 - 2 October 2012
+
+- fix build with latest pango
+
+Version 14.46 - 27 September 2012
+
+- left background for Mageia 3 alpha 2
+
+Version 14.45 - 20 September 2012
+
+- load fuse module automatically when trying to mount NTFS-3G (mga#5685)
+
+Version 14.44.1 - 16 September 2012
+
+- add spacing between license paragraphs
+
+Version 14.44 - 14 September 2012
+
+- adapt to xserver 1.13
+- advertize new doc license & licenser (mga#7347)
+- install cpupower instead of cpufreq
+- package group selection:
+  o remove "select all" button (not as usefull as "unselect all" & it
+    takes too much place when translated)
+
+Version 14.43 - 4 September 2012
+
+- compress report with xz instead of gzip
+- fix crash when clicking previous in minimal install step (mga#7345)
+- include swaplabel (mga#7334)
+
+Version 14.42 - 4 September 2012
+
+- load 'aesni_intel' crypto module for newer Intel CPUs (mga#7333)
+- recognize new drivers:
+  o input: hid-aureal synaptics_usb
+  o wifi: qmi_wwan, mwifiex_usb
+
+Version 14.41 - 3 September 2012
+
+- include back Ia Ora files for matchbox (mga#6451)
+
+Version 14.40 - 3 September 2012
+
+- prevent going further if some transactions failed (mga#7016)
+- summary: fix displayed network type (mga#4959)
+
+Version 14.39 - 3 September 2012
+
+- rely on stage1 for mounting /dev
+
+Version 14.38 - 2 September 2012
+
+- Mageia 3 alpha 1 banner
+
+Version 14.37 - 1 September 2012
+
+- Fix prefix checking in foreign partition check (mkinitrd)
+- More logging on why initrd generation is skipped 
+
+Version 14.36 - 30 August 2012
+
+- adapt to urpmi-7.5
+
+Version 14.35 - 30 August 2012
+
+- adapt to usbfs death
+
+Version 14.34 - 30 August 2012
+
+- adapt to perl-5.16.1
+- services:
+  o fix checking systemd presence after systemd merge of subpackages
+
+Version 14.32 - 28 July 2012
+
+- package group selection:
+  o add a scrollbar
+    (due to Oxygen theme eating more space than Ia Ora one)
+  o add "select all" & "unselect all" buttons
+- stop fixing the raid udev rule now that it has been fixed
+
+Version 14.31 - 24 July 2012
+
+- adapt to latest GDB
+- adapt to latest systemd/udevd
+- adapt to /usr move
+- nfs install: install nfs-utils instead of nfs-utils-clients
+  (#6570, merged back in nfs-utils)
+
+Version 14.30 - 23 June 2012
+
+- show all errors at once when setting media
+- fix settings 'suggests' properly according to 'no_suggests'
+  (aka default to suggests enabled)
+  regression intoduced in 14.23
+
+Version 14.29 - 17 June 2012
+
+- adapt to perl-URPM >= 4.2
+
+Version 14.28 - 11 June 2012
+
+- fix upgrade with rpm-4.10.0
+- really fix build with brltty-4.3
+
+Version 14.27 - 7 June 2012
+
+- debug mode:
+  o do not start udev twice
+  o just start the installer if one quits the shell
+  o spawn a shell like in regular mode
+- fix build with brltty-4.3
+
+Version 14.26 - 5 June 2012
+
+- fix detecting if Xorg started successfully
+
+Version 14.25 - 4 June 2012
+
+- fix fallbacking on curses install aka abort gtk install startup if X
+  failed to start
+- switch from Ia Ora to Oxygen Gtk theme
+- use proper design from original author
+
+Version 14.24 - 31 May 2012
+
+- adapt to latest xkb
+- fix build with perl-5.16.0
+
+Version 14.23.1 - 29 May 2012
+
+- include newly needed module
+
+Version 14.23 - 28 May 2012
+
+- do not create /dev/ entries created by udev
+- kill last remanents of kernel-2.4.x support
+- package group selection:
+  o remember minimal install values when clicking "previous"
+- packages installation:
+  o add support for 'justdb' option
+  o enable to go fast with 'tune-rpm'...
+- partitioning:
+  o first attempt at supporting XenBlk discs
+  o reduce blkid timeout to 30 seconds (mga#5979)
+- refactoring
+
+Version 14.22 - 15 May 2012
+
+- final banner
+- fix detecting if adding update media succeeded
+- authentication:
+  o don't update UsePAM option in sshd configuration
+
+Version 14.21 - 11 May 2012
+
+- export res_init function to perl lib
+
+Version 14.20.1 - 10 May 2012
+
+- drakx-in-chroot: unmount /dev in chroot
+
+Version 14.20 - 6 May 2012
+
+- bind mount /dev inside chroot rather than copy nodes (mga#5730)
+
+Version 14.19 - 3 May 2012
+
+- fix displaying urpmi fatal errors (mga#5725)
+
+Version 14.18 - 2 May 2012
+
+- add missing libfuse.so.2 for mount.ntfs-3g (#5685)
+
+Version 14.17 - 30 April 2012
+
+- fix noarch handling/search on 64bit as they're in 32 and 64 bit
+  media and in some cases it may return the not-installed rpm while the other is.
+- autoinstall:
+  o fix rebooting on autoinstall by using a "wider" regexp (otherwise udevd was
+    not found by fuzzy_pidofs) and gives some time to udevd process to disappear.
+  o don't try to unmount /dev as it's still used by other processes
+  o allow to set urpm curl options in order to be able to make curl quiet
+    when running an autoinstall in text mode. This can be set throught
+    the new option "curl_options" in the auto_inst file.
+  o use quiet mode by default when downloading VERSION and auto_inst file
+- partitioning:
+  o drop support for reiser4 (mga#5680)
+
+Version 14.16 - 29 April 2012
+
+- add btrfsck
+- partitioning:
+  o forbid having /boot as btrfs (mga#5627)
+
+Version 14.15 - 27 april 2012
+
+- partitioning:
+  o fix partitions not being shown after clicking on "Reload partition table"
+    (mga#3260)
+  o run udevadm in installer too
+    (might fix unnecessary reboot (mga#4439))
+
+Version 14.14 - 26 april 2012
+
+- Mageia 2 RC banner
+
+Version 14.13 - 25 April 2012
+
+- include needed symlinks for ndiswrapper (mdv#44416)
+
+Version 14.12 - 25 April 2012
+
+- update desktops images
+
+Version 14.11 - 25 April 2012
+
+- fix offering desktop choice (DVD has task-kde4-minimal instead of task-kde4)
+  (mga#5574)
+- partitioning:
+  o do not set fs_type to ext4 for raw LVM/RAID/LUKS
+  o detect LVM on top on Encrypted partitions (mga#5330)
+- services:
+  o systemd support (mga#3253, mga#3740, mga#4910, mga#5122)
+- partitioning wizard:
+  o fix removing several notebook pages
+  o reuse code from hd_gtk, fixes display of "Use free space" solution
+
+Version 14.10 - 23 April 2012
+
+- do not offer to upgrade mdv 201[1-9] (mga#5004)
+- do not try to update KDE3 to KDE4 anymore
+- individual package selection:
+  o fix a crash
+  o honor "no suggests" option (mga#3467)
+
+Version 14.9 - 23 April 2012
+
+- include missing perl modules (mga#5528)
+
+Version 14.8 - 20 April 2012
+
+- partitioning wizard:
+  o do not crash on selecting a RAID device
+  o fix displaying empty info about RAID devices
+  o fix listing RAID devices
+
+Version 14.7 - 19 April 2012
+
+- fix a crash when package state is empty (mga#5487)
+- fix not offering to upgrade RAID installs (mga#4902)
+  (udev was enabling RAIDs early but leaved them in inactive mode
+  due to not yet loaded personality modules)
+- when selecting where ro install bootloader, display mountpoint if
+  available, and size+fs_type if we have nothing (mga#5460)
+
+Version 14.6 - 18 April 2012
+
+- individual package selection:
+  o fix "invisible" lock icon (mga#5424)
+  o show again package descriptions (mga#549)
+- package installation:
+  o fix assuming "no" to continue on bad signatures once "do not ask
+    again" has been checked in
+  o offer to not ask again about missing packages
+  o unselect already suggested packages when performing a minimal
+    install if "no suggests" option was chosen (mga#5209)
+
+Version 14.5 - 12 April 2012
+
+- fix color for menu categories
+- add missing udev programs needed for persistant storage rules.
+
+Version 14.4 - 12 April 2012
+
+- fix quiet option for bootloader
+- install btrfs-progs if needed (mga#5274)
+- make sure ranges are always within limits in text mode (mga#646)
+- allow generation of host-only initrd during install
+- include persistant storage udev rules needed to see new uuids during install
+
+Version 14.3 - 7 April 2012
+
+- Mageia 2 beta 3 banner
+- diskdrake:
+  o fix partition numbering on GPT (mga#3091)
+
+Version 14.2 - 5 April 2012
+
+- add boot splash to initrd only once
+- log install settings (mga#3467 & mga#5209)
+- do not set security level to its own value on upgrade (mga#5147)
+- do not crash if msec isn't installed
+- do not offer to select the security level in summary if msec is not installed
+- text installer:
+  o include "screen" terminfo (mga#4894)
+
+Version 14.1 - 23 March 2012
+
+- better "bootloader" message (mga#484)
+- fix displaying "Mageia" in some messages
+
+Version 14.0 - 13 March 2012
+
+- disk install: handle bogus ISOs when looking for install image (mga#4919)
+- step column: hide so called "bootlader" step since we do _not_ actually
+  install bootloader at this stage but later in summary (mga#484)
+- make "Preparing bootloader" less intimidating (mga#484)
+
+Version 13.95 - 13 March 2012
+
+- recognize more HID drivers (mga#4905)
+
+Version 13.94 - 13 March 2012
+
+- actually use new installer help
+
+Version 13.93 - 12 March 2012
+
+- recognize c67x00, imx21-hcd, fhci, isp1362-hcd, oxu210hp-hcd & renesas-usbhs
+  USB host drivers (mga#4905)
+- use lxdm for LXDE
+
+Version 13.92 - 11 March 2012
+
+- explain why acpi, acpid & mageia-gfxboot-theme packages are selected 
+- install more packages earlier (shorewall & mandi), preventing useless
+  installing steps later at summary stage
+- partitioning:
+  o fix error on removing LVs
+  o fix resizing LVs (mga#4666)
+
+Version 13.91.1 - 08 March 2012
+
+- add a wrapper for running GDB in installer a simpler way
+
+Version 13.91 - 08 March 2012
+
+- Mageia 2 beta 2 banner
+- summary: 
+  o list mandi with iptables* & shorewall in services
+  o list dm, mdadm, messagebus, microcode_ctl, netconsole & partmon services in system
+  o list network, network-auth, network-up & resolvconf into new 'networking' category
+- debug build:
+  o don't run directly stage2
+  o include busybox
+  o include needed python files for GDB
+  o start udev since we fork a shell prior to running stage2
+
+Version 13.90 - 06 March 2012
+
+- fix crashing if we failed to initialize Curses
+- fix double segfault when text installer fails to init
+- fix stopping udev
+- set geometry for text installer
+
+Version 13.89 - 02 March 2012
+
+- fix RAID udev rule
+
+Version 13.88 - 02 March 2012
+
+- install mdadm for fake RAID too (mga#4750)
+
+Version 13.87 - 01 March 2012
+
+- include more udev rules for RAID (mga#4750)
+
+Version 13.86 - 01 March 2012
+
+- include libdmraid-events-isw.so for dmraid (mga#4750)
+- tty stty are needed for text mode installer (mga#2038)
+
+Version 13.85 - 26 February 2012
+
+- load 'xts' module for crypted fses (Dave Hodgins, mga#3749)
+
+Version 13.84 - 24 February 2012
+
+- recognize more HID drivers (mga#4129)
+
+Version 13.83 - 19 February 2012
+
+- log more stuff regarding packages installation (mga#4565)
+
+Version 13.82 - 14 February 2012
+
+- Mageia 2 beta 1 banner
+
+Version 13.81 - 13 February 2012
+
+- diskdrake:
+  o use better cipher for encrypted fses (mga#3092)
+
+Version 13.80 - 26 January 2012
+
+- kill old gtk+ warnings that confuse people
+- include back urpmi translations
+- do not display errors when loading a driver that is already loaded (mga#1146)
+
+Version 13.78 - 24 January 2012
+
+- log packages selected b/c of HW, fs, install method, ...
+- summary: 
+  o list shorewall with iptables* in services
+- diskdrake:
+  o better default name for new VG (vg-mga, vg-mga1, ...
+    instead of vg-0, vg-1, ...)
+
+Version 13.77 - 23 January 2012
+
+- diskdrake:
+  o allow using nilfs2 during install
+  o enable to set label on btrfs & nilfs fses as well as on swap
+  o preserve UUID when reformating a nilfs fs
+- do not install shorewall & mandi if firefwall is not configured
+
+Version 13.76 - 20 January 2012
+
+- add support for XZ modules
+- faster & safer waiting for end of USB modules
+- include gtk20 translations (caps lock & the like)
+- diskdrake:
+  o enable to set LV names when not in expert mode
+  o report back error from lvm2
+  o suggest better LV names based on the mount point rather than numbers
+
+Version 13.75.1 - 19 January 2012
+
+- fix mounting /dev/pts & /dev/shm
+- include DM/MD udev rules so that install on LVM works again
+- drakx-in-chroot:
+  o add support for --gdb
+
+Version 13.75 - 29 December 2011
+
+- stop udev at end of install
+- Mageia 2 Alpha 3 banner
+
+Version 13.74.1 - 29 December 2011
+
+- rebuild with updated list_modules.pm for kernel-3.2.0-0.rc7.2.mga2 
+
+Version 13.74 - 24 December 2011
+
+- use udev
+- call udevadm in installer too
+- do not hardcode systemd default through kernel command line, it
+  should be easily overridable by just picking the proper init package
+- include xfs_freeze (needed for setup grub on XFS, mga#1536)
+- interactive::curses: default to 80x25 (fixes serial)
+
+Version 13.73 - 11 December 2011
+
+- Mageia 2 Alpha 2 banner
+
+Version 13.69 - 14 November 2011
+
+- fix testing network (missing Net::Ping)
+
+Version 13.68 - 10 November 2011
+
+- Mageia 2 Alpha 1 banner
+
+Version 13.67 - 07 November 2011
+
+- Add initial systemd support
+
+Version 13.66 - 20 October 2011
+
+- fix missing "Mageia" instances
+- include png loader from gdk_pixbuf2.0_0-loaders-png15
+
+Version 13.65 - 19 September 2011
+
+- only favor packages with mga extension, we don't have packages with mdv or
+  mnb in release tag
+- always favor packages with 'mga' extension when upgrading anything else
+  than Mageia
+- install perl-Hal-Cdroms for urpmi when needed
+- default to systemd (through "init=/bin/systemd")
+- offer not to ask again about bad signatures
+
+Version 13.64 - 08 September 2011
+
+- install more packages earlier (acpi{,d}, dhcp client, firewall & bootloader
+  stuff), preventing useless installing steps later at summary stage & also
+  fixing "program not found: grub-gfxmenu" error message while installing
+- only retrieve release notes once during installation
+- util-linux-ng was renamed util-linux (fix installation error)
+
+Version 13.63 - 07 September 2011
+
+- better microcode_ctl management
+- fix cpufreq detection corrupting other types
+- install cpufreq on more cases
+
+Version 13.62 - 22 August 2011
+
+- always align partitions to start at megabyte boundaries to avoid
+  performance issues with drives with 4k physical sectors (mga#1215)
+- add support to detect if CPU microcode is upgradable in order to
+  install microcode_ctl
+
+Version 13.61.1 - 05 August 2011
+
+- do not crash if there's no mirror cache to erase
+- "Multi languages" => "Multiple languages" (mga#1011)
+
+Version 13.61 - 01 August 2011
+
+- clear the mirror cache before upgrading (#1557)
+- fix bootloader entries names
+- fix build with perl-5.14.x
+- detect (at least some (eg: Compaq USB numpad) (#1099)
+- detect machines needing cpufreq
+- spaces are not allowed between options in /etc/fstab (#2271)
+
+Version 13.58 - 27 May 2011
+
+- fix default level being 'standard' when /etc/security/msec/security.conf
+  doesn't containt BASE_LEVEL
+  (broken since msec config file format was gratuitously changed)
+
+Version 13.57 - 25 May 2011
+
+- update translations
+- update design for final release
+
+Version 13.56 - 24 May 2011
+
+- forbid selecting kernel-server if not having PAE since PAE support is
+  mandatory for kernel-server (#1414)
+
+Version 13.54 - 19 May 2011
+
+- advertize LibreOffice instead of OpenOffice.org (mga#1323)
+- fix build with brltty-4.2-1.mga1
+- fix reading security level with new msec (mga#332)
+
+Version 13.53 - 16 May 2011
+
+- left background for RC
+
+Version 13.52 - 14 May 2011
+
+- disable encryption option for /boot
+- match partitions when one of them as device_alias to the device of the other one
+
+Version 13.50 - 06 May 2011
+
+- use proper locales-XX packages for Albanian (#1036)
+
+Version 13.49 - 25 May 2011
+- add nokmsboot boot option also if the bootloader is installed after setting
+  up a conflicting display driver (e.g. draklive-install)
+- embed more of unicore, fixes \d on strings collected from Gtk2 (#39)
+- add sdhci-pci to card-reader list
+- add xhci-hcd (usb3 support)
+
 Version 13.47
 - update modules list needed for md raid456 and dm-raid 4/5/6 target
 
@@ -406,7 +2095,7 @@ Version 12.62 - 9 October 2009
 
 Version 12.61 - 8 October 2009
 
-- partitionning_wizard:
+- partitioning_wizard:
   o do not fail when a windows partition is corrupted
   o add separator between solutions
   o give more space between header and solutions
@@ -435,7 +2124,7 @@ Version 12.59 - 07 October 2009
 Version 12.58 - 05 October 2009
 
 - better describe what usernames we allow (#44783)
-- rewrite partitionning wizard to look better in gtk (not perfect yet)
+- rewrite partitioning wizard to look better in gtk (not perfect yet)
 
 Version 12.54 - 23 September 2009
 
@@ -580,7 +2269,7 @@ Version 12.33 - 23 April 2009
 Version 12.32 - 23 April 2009
 
 - fix cdrom path in urpmi.cfg for dual arch ISOs
-- advanced partitionning step:
+- advanced partitioning step:
   o fix displaying help at install time
 
 Version 12.31 - 22 April 2009
@@ -929,7 +2618,7 @@ Version 11.77 - 15 January 2008
 
 Version 11.76 - 18 December 2008
 
-- partitionning:
+- partitioning:
   o use sysfs in order to discover major/minor for SCSI like devices
     since they're dynamic with kernel-2.6.28+
 - adapt to cooker: librpm4.6 uses libnss3 which needs its modules
@@ -940,7 +2629,7 @@ Version 11.75 - 17 December 2008
   (since the default in xorg has changed)
 - handle new driver:
   o network: sxg, w35und
-- partitionning:
+- partitioning:
   o kernel-2.6.28+ supports more than 15 partitions on SATA & SCSI devices
 
 Version 11.74 - 16 December 2008
@@ -1104,7 +2793,7 @@ Version 11.47 - 17 September 2008
 
 - handle new driver:
   o ethernet: jme
-- partitionning step
+- partitioning step
   o handle partitions encrypted with cryptsetup
   o fix file system type drop down list showing most types as "..." in
     "Change partition type" dialog in expert mode due to ellipsizing
@@ -1132,7 +2821,7 @@ Version 11.43 - 16 September 2008
 - fix displaying current security level in GUI
   (regression introduced on 2008-08-29)
 - increase default window height b/c of package selection step
-- refresh partitionning step
+- refresh partitioning step
 - size most labels (workaround infamous 6 years old gnome bug #101968)
   (eg: in advanced language selection)
 - update icons for packages/services selection
@@ -1184,7 +2873,7 @@ Version 11.38 - 8 September 2008
 
 - do not size radio button that have a label thus preventing uneeded horizontal
   scrollbars to appear
-- partitionning step
+- partitioning step
   o fix file system type drop down list showing most types as "..." in expert
     mode due to ellipsizing (#43611)
   o fix too large partition bar (#43073)
@@ -1233,7 +2922,7 @@ Version 11.30 - 1 September 2008
 - fix alignment of check buttons
 - fix size of right aligned labels
 - fix sizing radio buttons' labels (infamous 6 years old gnome bug #101968)
-- further improvements to the "bootloader", "desktop" & "partitionning" steps
+- further improvements to the "bootloader", "desktop" & "partitioning" steps
 - prevent big combo boxes to cause an horizontall scrollbar to appear by
   using the "ellipsize" property
 - remove "Generate auto install floppy" & "Save packages selection"
@@ -1302,7 +2991,7 @@ Version 11.21 - 21 August 2008
   box in english lang (#41103)
 - do not set $HOME while installing packages (#18088)
 - install proper qtX package for gcin
-- partitionning step
+- partitioning step
   o ensure we initialize only once but at least one, thus fixing crash
     when embedded or in installer (#43011)
 
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index e5050b8e9..f6a106553 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -1,4 +1,4 @@
-package install::any; # $Id: any.pm 259898 2009-09-03 14:05:46Z tv $
+package install::any;
 
 use strict;
 
@@ -8,6 +8,7 @@ our @EXPORT_OK = qw(addToBeDone);
 #-######################################################################################
 #- misc imports
 #-######################################################################################
+use feature 'state';
 use common;
 use run_program;
 use fs::type;
@@ -22,8 +23,24 @@ use lang;
 use any;
 use log;
 
+=head1 SYNOPSYS
+
+Misc installer specific functions
+
+=head1 Functions
+
+=over
+
+=cut
+
 our @advertising_images;
 
+=item drakx_version($o)
+
+Returns DrakX version as stored in C<install/stage2/VERSION> file
+
+=cut
+
 sub drakx_version { 
     my ($o) = @_;
 
@@ -38,13 +55,25 @@ sub dont_run_directly_stage2() {
     readlink("/usr/bin/runinstall2") eq "runinstall2.sh";
 }
 
+=item is_network_install($o)
+
+Is it a network install?
+
+=cut
+
 sub is_network_install {
     my ($o) = @_;
     member($o->{method}, qw(ftp http nfs));
 }
 
+=item spawnShell()
+
+Starts a shell on tty2
+
+=cut
+
 sub spawnShell() {
-    return if $::local_install || $::testing || dont_run_directly_stage2();
+    return if $::local_install || $::testing;
 
     my $shellpid_file = '/var/run/drakx_shell.pid';
     return if -e $shellpid_file && -d '/proc/' . chomp_(cat_($shellpid_file));
@@ -54,7 +83,8 @@ sub spawnShell() {
         return;
     }
 
-    $ENV{DISPLAY} ||= ":0"; #- why not :pp
+    #- why not :pp
+    $ENV{DISPLAY} ||= ":0" if $::o->{interactive} eq "gtk";
 
     local *F;
     sysopen F, "/dev/tty2", 2 or log::l("cannot open /dev/tty2 -- no shell will be provided: $!"), goto cant_spawn;
@@ -82,6 +112,12 @@ cant_spawn:
     c::_exit(1);
 }
 
+=item getAvailableSpace($o)
+
+Returns available space
+
+=cut
+
 sub getAvailableSpace {
     my ($o) = @_;
     fs::any::getAvailableSpace($o->{fstab});
@@ -101,6 +137,12 @@ sub preConfigureTimezone {
     add2hash_($o->{timezone}, { UTC => $utc, ntp => $ntp });
 }
 
+=item ask_suppl_media_method($o)
+
+Enables to add supplementary media
+
+=cut
+
 sub ask_suppl_media_method {
     my ($o) = @_;
     our $suppl_already_asked;
@@ -113,18 +155,18 @@ sub ask_suppl_media_method {
 
 
 Do you have a supplementary installation medium to configure?",
-	    "\n\n\n" . join(",\n\n", map { "- $_->{name}" } install::media::allMediums($o->{packages}))));
+	    "\n\n\n" . join(",\n\n", map { "- $_->{name}" . ($_->{ignore} ? " (disabled)" : '') } install::media::allMediums($o->{packages}))));
 
     my %l = my @l = (
 	''      => N("None"),
-	'cdrom' => N("CD-ROM"),
 	'http'  => N("Network (HTTP)"),
 	'ftp'   => N("Network (FTP)"),
 	'nfs'   => N("Network (NFS)"),
     );
 
-    $o->ask_from(
-	'', $msg,
+    $o->ask_from_({ messages => $msg,
+		    interactive_help_id => 'add_supplemental_media',
+		  },
 	[ {
 	    val => \my $suppl,
 	    list => [ map { $_->[0] } group_by2(@l) ],
@@ -137,8 +179,13 @@ Do you have a supplementary installation medium to configure?",
     $suppl;
 }
 
-#- if the supplementary media is networked, but not the main one, network
-#- support must be installed and network started.
+=item prep_net_suppl_media($o)
+
+If the supplementary media is networked, but not the main one, network
+support must be installed and network started.
+
+=cut
+
 sub prep_net_suppl_media {
     my ($o) = @_;
 
@@ -146,11 +193,16 @@ sub prep_net_suppl_media {
     return if our $net_suppl_media_configured && network::tools::has_network_connection();
     $net_suppl_media_configured = 1;
 
-    # needed so that one can install basesystem before adding suppl network media:
-    install::media::configure_media($o->{packages});
-    #- install basesystem now
-    $o->do_pkgs->ensure_is_installed('basesystem', undef, 1);
+    # needed so that one can install basesystem-minimal before adding suppl network media:
+    install::media::update_media($o->{packages});
+    require urpm::media;
+    urpm::media::configure($o->{packages});
 
+    #- install basesystem-minimal now
+    $o->do_pkgs->ensure_is_installed('basesystem-minimal', undef, 1);
+
+    # in case of no network install:
+    $o->{net} ||= {};
     require network::netconnect;
     network::netconnect::real_main($o->{net}, $o, $o->{modules_conf});
     require install::interactive;
@@ -158,6 +210,12 @@ sub prep_net_suppl_media {
     sleep(3);
 }
 
+=item ask_url($in, $o_url)
+
+Asks URL of the mirror
+
+=cut
+
 sub ask_url {
     my ($in, $o_url) = @_;
 
@@ -173,18 +231,25 @@ sub ask_url {
 	      }
 	  } } ]) && $url;
 }
+
+=item ask_mirror($o, $type, $o_url)
+
+Retrieves list of mirrors and offers to pick one
+
+=cut
+
 sub ask_mirror {
     my ($o, $type, $o_url) = @_;
     
     require mirror;
 
     my $mirrors = eval {
-	my $_w = $o->wait_message('', N("Contacting %s web site to get the list of available mirrors..."));
+	my $_w = $o->wait_message('', N("Contacting %s web site to get the list of available mirrors...", N("Mageia")));
 	mirror::list($o->{product_id}, $type);
     };
     my $err = $@;
     if (!$mirrors) {
-	$o->ask_warn('', N("Failed contacting %s web site to get the list of available mirrors") . "\n$err");
+	$o->ask_warn('', N("Failed contacting %s web site to get the list of available mirrors", N("Mageia")) . "\n$err");
 	return ask_url($o, $o_url);
     }
 
@@ -217,10 +282,8 @@ sub ask_mirror {
 sub ask_suppl_media_url {
     my ($o, $method, $o_url) = @_;
 
-    if ($method eq 'ftp' || $method eq 'http') {
+    if (member($method, qw(ftp http))) {
 	install::any::ask_mirror($o, 'distrib', $o_url);
-    } elsif ($method eq 'cdrom') {
-	'cdrom://';
     } elsif ($method eq 'nfs') {
 	my ($host, $dir) = $o_url ? $o_url =~ m!nfs://(.*?)(/.*)! : ();
 	$o->ask_from_(
@@ -242,6 +305,14 @@ sub ask_suppl_media_url {
 	"nfs://$host$dir";
     } else { internal_error("bad method $method") }
 }
+
+
+=item selectSupplMedia($o)
+
+Offers to add a supplementary media. If yes, ask which mirror to use, ...
+
+=cut
+
 sub selectSupplMedia {
     my ($o) = @_;
     my $url;
@@ -250,7 +321,7 @@ sub selectSupplMedia {
     my $method = ask_suppl_media_method($o) or return;
 
     #- configure network if needed
-    if (!scalar keys %{$o->{net}{ifcfg}} && $method !~ /^(?:cdrom|disk)/ && !$::local_install) {
+    if (!scalar keys %{$o->{net}{ifcfg}} && $method !~ /^(?:disk)/ && !$::local_install) {
 	prep_net_suppl_media($o);
     }
 
@@ -296,6 +367,15 @@ sub selectSupplMedia {
     goto ask_url;
 }
 
+=item load_rate_files($o)
+
+Loads the package rates file (C<rpmsrate>) as well as the C<compssUsers.pl>
+file which contains the package groups GUI.
+
+Both files came from the C<meta-task> package.
+
+=cut
+
 sub load_rate_files {
     my ($o) = @_;
     #- must be done after getProvides
@@ -308,31 +388,215 @@ sub load_rate_files {
     defined $o->{compssUsers} or die "Can't read compssUsers.pl file, aborting installation\n";
 }
 
+sub _core_medium() { N("Core Release") }
+
+sub _tainted_medium() { N("Tainted Release") }
+
+sub _nonfree_medium() { N("Nonfree Release") }
+
+# FIXME: move me in ../any.pm or in harddrake::*, might be needed by rpmdrake/harddrake:
+sub is_firmware_needed_ {
+    my ($o) = @_;
+    require list_firmwares;
+    my @l = map { $_->{driver} } detect_devices::probeall();
+    my @need = intersection(\@l, \@list_firmwares::modules_with_nonfree_firmware);
+    log::l("the following driver(s) need nonfree firmware(s): " . join(', ', @need)) if @need;
+
+    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;
+
+    my $need_microcode = detect_devices::hasCPUMicrocode();
+    log::l("nonfree firmware is needed for the CPU (microcode)") if $need_microcode;
+
+    @need || @xpkgs || $need_microcode;
+}
+
+=item is_firmware_needed($o)
+
+Is a firmware needed by some HW?
+
+=cut
+
+sub is_firmware_needed {
+    my ($o) = @_;
+    return 0 if $::o->{match_all_hardware};
+    state $res;
+    $res = is_firmware_needed_($o) if !defined $res;
+    $res;
+}
+
+sub msg_if_firmware_needed {
+    my ($o) = @_;
+    return if !is_firmware_needed($o);
+    join("\n",
+	 # FIXME: actually can be proprietary drivers (same medium eventually):
+         N("Some hardware on your machine needs some non free firmwares in order for the free software drivers to work."),
+         N("You should enable \"%s\"", _nonfree_medium()),
+     );
+}
+
+=item enable_nonfree_media($medium)
+
+Enable a disabled Nonfree medium.
+
+=cut
+
+sub enable_nonfree_media {
+    my ($medium) = @_;
+    return if $medium->{name} !~ /Nonfree/ || !$medium->{ignore};
+    log::l("preselecting $medium->{name}");
+    $medium->{temp_enabled} = 1;
+}
+
+=item media_screen($o)
+
+Lists available media with their status (enabled/disabled).
+Suggests to enable Nonfree media if needed.
+
+=cut
+
+sub media_screen {
+    my ($o) = @_;
+
+    my $urpm = $o->{packages};
+    # FIXME:
+    # - nice info
+    # - ignore already failed media (such as 32bit media on NFS)
+    # - detect if non-free/tainted were selected previously / are now needed
+    #   rpm -qa |grep tainted/non-free
+    # - use red color in that case (gtk+ version? interactive::gtk version?)
+    # - present media as trees (eg 3 main branches (core/nonfree/tainted and sub medium below (release/updates/...)
+    # - enable to add media from the media screen
+    # - introduce 'mandatory' keyword for guessing media that can *not* be disabled
+    my %descriptions = (
+        'Core Release' => N("\"%s\" contains the various pieces of the systems and its applications", _core_medium()),
+        'Nonfree Release' => N("\"%s\" contains non free software.\n", _nonfree_medium()) . " " .
+          N("It also contains firmwares needed for certain devices to operate (eg: some ATI/AMD graphic cards, some network cards, some RAID cards, ...)"),
+        'Tainted Release' => N("\"%s\" contains software that can not be distributed in every country due to software patents.", _tainted_medium()) . " " .
+          N("It also contains software from \"%s\" rebuild with additional capabilities.", _core_medium()),
+    );
+
+    my $nonfree_is_needed = is_firmware_needed($o);
+
+    $o->ask_from_({ messages => join("\n",
+                                      N("Here you can enable more media if you want."),
+                                      msg_if_firmware_needed($o)
+                                  ),
+		    interactive_help_id => 'media_selection',
+                     focus_first => sub { 1 } }, [ 
+        map {
+            my $medium = $_;
+	    $medium->{temp_enabled} = !$medium->{ignore};
+	    my $name = $medium->{name};
+	    my ($distribconf, $medium_path) = @{$_->{mediacfg}};
+	    my @media_types = split(':', $distribconf->getvalue($medium_path, 'media_type'));
+	    my $parent = $distribconf->getvalue($distribconf->getvalue($medium_path, 'updates_for'), 'name');
+	    my $non_regular_medium = intersection(\@media_types, [ qw(backports debug source testing) ]);
+	    enable_nonfree_media($medium) if $nonfree_is_needed && !$non_regular_medium;
+	    $non_regular_medium ? () :
+	    +{
+                val => \$medium->{temp_enabled}, type => 'bool', text => $name,
+		help => $medium->{update} ? N("This medium provides package updates for medium \"%s\"", $parent) : $descriptions{$name},
+                # 'Core Release' cannot be unselected:
+                disabled => sub {
+		    state $parent_media = $parent && urpm::media::name2medium($urpm, $parent);
+		    $name =~ /^(?:Core|Main) Release$/ || $parent_media ? !$parent_media->{temp_enabled} : 0;
+		},
+            };
+	} @{$urpm->{media}},
+    ]);
+
+
+    # is there some media to enable?
+    my $todo;
+    foreach my $medium (@{$urpm->{media}}) {
+        if ($medium->{temp_enabled} == $medium->{ignore}) {
+            $medium->{ignore} = !$medium->{temp_enabled};
+            if (!$medium->{ignore}) {
+		delete $medium->{ignore};
+		log::l("Medium '$medium->{name}' needs to be updated to be usable");
+		urpm::media::select_media($urpm, $medium->{name});
+		$todo = 1;
+	    }
+	}
+	delete $medium->{temp_enabled};
+    }
+    return if !$todo;
+    urpm::media::update_media($urpm, allow_failures => 1, nolock => 1, noclean => 1,
+			      callback => \&urpm::download::sync_logger
+			     );
+}
+
+=item setPackages($o)
+
+=over 4
+
+=item * Initialize urpmi
+
+=item * Retrieves media.cfg
+
+=item * Offers to add supplementary media (according to the install method)
+
+=item * Offers to enable some disabled media
+
+=item * Ensure we have a kernel and basesystem
+
+=item * Flags package rates
+
+=item * Select default packages according to the computer
+
+=back
+
+=cut
+
 sub setPackages {
     my ($o) = @_;
 
+    my $urpm;
     require install::pkgs;
     {
-	$o->{packages} = install::pkgs::empty_packages($o->{keep_unrequested_dependencies});
+	#- clean shared regions very early
+	#  (update_media will open rpmdb for listing existing pubkeys,
+	#   which may fail when rpm version mistmatches between drakx & chrooted env)
+	install::pkgs::clean_rpmdb_shared_regions();
+	$urpm = $o->{packages} = install::pkgs::empty_packages($o->{keep_unrequested_dependencies});
 	
 	my $media = $o->{media} || [ { type => 'media_cfg', url => 'drakx://media' } ];
+	my ($suppl_method, $copy_rpms_on_disk);
 
-	my ($suppl_method, $copy_rpms_on_disk) = install::media::get_media($o, $media, $o->{packages});
+	{
+	    install::pkgs::start_pushing_error();
+	    ($suppl_method, $copy_rpms_on_disk) = install::media::get_media($o, $media, $urpm);
 
-	if ($suppl_method) {
-	    1 while $o->selectSupplMedia;
+	    if ($suppl_method) {
+	        1 while $o->selectSupplMedia;
+	    }
+	    install::media::update_media($urpm);
+	    install::pkgs::popup_errors();
 	}
 
-        install::media::configure_media($o->{packages});
-        install::media::adjust_paths_in_urpmi_cfg($o->{packages});
+        install::pkgs::start_pushing_error();
+        media_screen($o) if !$::auto_install;
+        my @choosen_media = map { $_->{name} } grep { !$_->{ignore} } @{$urpm->{media}};
+        log::l("choosen media: ", join(', ', @choosen_media));
+        die "no choosen media" if !@choosen_media;
+
+        # actually read synthesis now we have all the ones we want:
+        require urpm::media;
+        urpm::media::configure($urpm);
+
+        install::pkgs::popup_errors();
+
+        install::media::adjust_paths_in_urpmi_cfg($urpm);
         log::l('urpmi completely set up');
 
 	#- open rpm db according to right mode needed
-	$o->{packages}{rpmdb} ||= install::pkgs::rpmDbOpen('rebuild_if_needed');
+	$urpm->{rpmdb} ||= install::pkgs::rpmDbOpen('rebuild_if_needed');
 
 	{
 	    my $_wait = $o->wait_message('', N("Looking at packages already installed..."));
-	    install::pkgs::selectPackagesAlreadyInstalled($o->{packages});
+	    install::pkgs::selectPackagesAlreadyInstalled($urpm);
 	}
 
         remove_package_for_upgrade($o);
@@ -341,15 +605,15 @@ sub setPackages {
 
 	#- always try to select basic kernel (else on upgrade, kernel will never be updated provided a kernel is already
 	#- installed and provides what is necessary).
-	my $kernel_pkg = install::pkgs::bestKernelPackage($o->{packages}, $o->{match_all_hardware});
-	install::pkgs::selectPackage($o->{packages}, $kernel_pkg, 1);
-	if ($o->{isUpgrade} && $o->{packages}{sizes}{dkms}) {
-	    my $devel_kernel_pkg = "$1-devel-latest" if $kernel_pkg =~ /(.*)-latest/;
+	my $kernel_pkg = install::pkgs::bestKernelPackage($urpm, $o->{match_all_hardware});
+	install::pkgs::selectPackage($urpm, $kernel_pkg, 1);
+	if ($o->{isUpgrade} && $urpm->{sizes}{dkms} && $kernel_pkg =~ /(.*)-latest/) {
+	    my $devel_kernel_pkg = "$1-devel-latest";
 	    log::l("selecting $devel_kernel_pkg (since dkms was installed)");
-	    install::pkgs::select_by_package_names($o->{packages}, [ $devel_kernel_pkg], 1);
+	    install::pkgs::select_by_package_names($urpm, [ $devel_kernel_pkg ], 1);
 	}
 
-	install::pkgs::select_by_package_names_or_die($o->{packages}, ['basesystem'], 1);
+	install::pkgs::select_by_package_names_or_die($urpm, ['basesystem'], 1);
 
 	my $rpmsrate_flags_was_chosen = $o->{rpmsrate_flags_chosen};
 
@@ -365,18 +629,17 @@ sub setPackages {
     }
 
     if ($o->{isUpgrade}) {
-	{
-	    my $_w = $o->wait_message('', N("Finding packages to upgrade..."));
-	    install::pkgs::selectPackagesToUpgrade($o->{packages});
-	}
-	if ($o->{packages}{sizes}{'kdebase-progs'}) {
-	    log::l("selecting task-kde (since kdebase-progs was installed)");
-	    install::pkgs::select_by_package_names($o->{packages}, ['task-kde']);
-	}
-        upgrade_kde3_to_kde4($o);
+        my $_w = $o->wait_message('', N("Finding packages to upgrade..."));
+        install::pkgs::selectPackagesToUpgrade($urpm);
     }
 }
 
+=item remove_package_for_upgrade($o)
+
+Removes packages that must be uninstalled prior to upgrade
+
+=cut
+
 sub remove_package_for_upgrade {
     my ($o) = @_;
     my $extension = $o->{upgrade_by_removing_pkgs_matching};
@@ -399,15 +662,11 @@ sub remove_package_for_upgrade {
     log::l("Removing packages took: ", formatTimeRaw(time() - $time));
 }
 
-sub upgrade_kde3_to_kde4 {
-    my ($o) = @_;
-    if ((-e "$::prefix/usr/bin/kicker" || -e "$::prefix/opt/kde3/bin/kicker")
-          && !install::pkgs::packageByName($o->{packages}, 'task-kde3')) {
-        log::l("kde3 installed, but task-kde3 not available so can't upgrade correctly");
-        log::l("ok, continuing anyway, but forcing install of task-kde4");
-        install::pkgs::select_by_package_names($o->{packages}, ['task-kde4']);
-    }
-}
+=item count_files($dir)
+
+Returns the number of files in $dir
+
+=cut
 
 sub count_files {
     my ($dir) = @_;
@@ -509,6 +768,7 @@ sub rpmsrate_always_flags {
         log::l("activation light desktop mode (for low resources systems or netbook/nettops)");
         $rpmsrate_flags_chosen->{LIGHT} = 1;
     }
+    # FIXME: to be updated!!!
     $rpmsrate_flags_chosen->{'3D'} = 1 if
       $o->{match_all_hardware} ||
       detect_devices::matching_desc__regexp('Matrox.* G[245][05]0') ||
@@ -534,20 +794,46 @@ sub rpmsrate_always_flags {
     $rpmsrate_flags_chosen;
 }
 
+=item default_packages($o)
+
+Selects default packages to install according to configuration (FS, HW, ...)
+
+=cut
+
 sub default_packages {
     my ($o) = @_;
     my @l;
 
-    push @l, "brltty" if cat_("/proc/cmdline") =~ /brltty=/;
-    push @l, "nfs-utils-clients" if $o->{method} eq "nfs";
-    push @l, "mdadm" if !is_empty_array_ref($o->{all_hds}{raids});
-    push @l, "lvm2" if !is_empty_array_ref($o->{all_hds}{lvms});
-    push @l, "cryptsetup" if !is_empty_array_ref($o->{all_hds}{dmcrypts});
-    push @l, "dmraid" if any { fs::type::is_dmraid($_) } @{$o->{all_hds}{hds}};
-    push @l, 'cpufreq' if cat_('/proc/cpuinfo') =~ /AuthenticAMD/ && arch() =~ /x86_64/
-      || cat_('/proc/cpuinfo') =~ /model name.*Intel\(R\) Core\(TM\)2 CPU/;
-    push @l, 'apmd' if -e "/proc/apm";
-    push @l, detect_devices::probe_name('Pkg');
+    sub add_n_log {
+       my ($reason, @packages) = @_;
+       if (@packages) {
+          log::l("selecting " . join(',', @packages) . " because of $reason");
+          push @l, @packages;
+       }
+    }
+
+    add_n_log("/proc/cmdline=~/brltty=/", "brltty") if cat_("/proc/cmdline") =~ /brltty=/;
+    add_n_log("method==nfs", "nfs-utils") if $o->{method} eq "nfs";
+    add_n_log("have RAID", "mdadm") if !is_empty_array_ref($o->{all_hds}{raids});
+    add_n_log("have LVM", "lvm2") if !is_empty_array_ref($o->{all_hds}{lvms});
+    add_n_log("have crypted DM", "cryptsetup") if !is_empty_array_ref($o->{all_hds}{dmcrypts});
+    add_n_log("some disks are fake RAID", qw(mdadm dmraid)) if any { fs::type::is_dmraid($_) } @{$o->{all_hds}{hds}};
+    add_n_log("CPU needs microcode", "microcode_ctl") if detect_devices::hasCPUMicrocode();
+    add_n_log("either CPU or GFX needs firmware", qw(kernel-firmware-nonfree radeon-firmware)) if is_firmware_needed($o);
+    add_n_log("CPU needs cpupower", 'cpupower') if detect_devices::hasCPUFreq();
+    add_n_log("APM support needed", 'apmd') if -e "/proc/apm";
+    add_n_log("needed by hardware", detect_devices::probe_name('Pkg'));
+    my @ltmp = map { $_->{BOOTPROTO} eq 'dhcp' ? $_->{DHCP_CLIENT} || 'dhcp-client' : () } values %{$o->{net}{ifcfg}};
+    add_n_log("needed by networking", @ltmp) if @ltmp;
+    # will get auto selected at summary stage for bootloader:
+    add_n_log("needed later at summary stage", qw(acpi acpid mageia-gfxboot-theme));
+    # will get auto selected at summary stage for firewall:
+    add_n_log("needed for firewall/security", qw(shorewall shorewall-ipv6 mandi-ifw));
+    # only needed for CDs/DVDs installations:
+    add_n_log("method='cdrom'", 'perl-Hal-Cdroms') if $o->{method} eq 'cdrom';
+    add_n_log("needed for VMware hypervisor", 'open-vm-tools') if detect_devices::is_vmware();
+    # we only support grub2-efi on UEFI:
+    add_n_log("needed for UEFI boot", 'grub2-efi') if is_uefi();
 
     my $dmi_BIOS = detect_devices::dmidecode_category('BIOS');
     my $dmi_Base_Board = detect_devices::dmidecode_category('Base Board');
@@ -557,16 +843,18 @@ sub default_packages {
 	modules::append_to_modules_loaded_at_startup_for_all_kernels('acerhk');
     }
 
-    push @l, 'quota' if any { $_->{options} =~ /usrquota|grpquota/ } @{$o->{fstab}};
-    push @l, uniq(grep { $_ } map { fs::format::package_needed_for_partition_type($_) } @{$o->{fstab}});
-    push @l, 'ntfs-3g' if any { $_->{fs_type} eq 'ntfs-3g' } @{$o->{fstab}};
+    add_n_log("some fs is mounted with quota options", 'quota') if any { $_->{options} =~ /usrquota|grpquota/ } @{$o->{fstab}};
+    @ltmp = uniq(grep { $_ } map { fs::format::package_needed_for_partition_type($_) } @{$o->{fstab}});
+    add_n_log("needed by some fs", @ltmp) if @ltmp;
+    add_n_log("some fs is NTFS-3G", 'ntfs-3g') if any { $_->{fs_type} eq 'ntfs-3g' } @{$o->{fstab}};
+    add_n_log("some fs is btrfs", 'btrfs-progs') if any { $_->{fs_type} eq 'btrfs' } @{$o->{fstab}};
 
     # handle locales with specified scripting:
     my @languages = map { s/\@.*//; $_ } lang::langsLANGUAGE($o->{locale}{langs});
     my @locale_pkgs = map { URPM::packages_providing($o->{packages}, 'locales-' . $_) } @languages;
     unshift @l, uniq(map { $_->name } @locale_pkgs);
 
-    @l;
+    uniq(@l);
 }
 
 sub mark_skipped_packages {
@@ -656,7 +944,7 @@ sub g_auto_install {
     require install::pkgs;
     $o->{default_packages} = install::pkgs::selected_leaves($::o->{packages});
 
-    my @fields = qw(mntpoint fs_type size);
+    my @fields = qw(fs_type hd level mntpoint options parts size VG_name);
     $o->{partitions} = [ map { 
 	my %l; @l{@fields} = @$_{@fields}; \%l;
     } grep { 
@@ -706,9 +994,6 @@ sub getAndSaveAutoInstallFloppies {
 
     eval { modules::load('loop') };
 
-    if (arch() =~ /ia64/) {
-	#- nothing yet
-    } else {
 	my $mountdir = "$::prefix/root/aif-mount"; -d $mountdir or mkdir $mountdir, 0755;
 	my $param = 'kickstart=floppy ' . generate_automatic_stage1_params($o);
 
@@ -716,7 +1001,7 @@ sub getAndSaveAutoInstallFloppies {
 
 	{
 	    my $dev = devices::set_loop($img) or log::l("couldn't set loopback device"), return;
-	    find { eval { fs::mount::mount($dev, $mountdir, $_, 0); 1 } } qw(ext2 vfat) or return;
+	    find { eval { fs::mount::mount($dev, $mountdir, $_, 0); 1 } } qw(ext2 vfat ntfs-3g) or return;
 
 	    if (-e "$mountdir/menu.lst") {
 		# hd_grub boot disk is different than others
@@ -751,7 +1036,6 @@ sub getAndSaveAutoInstallFloppies {
 	}
 	rmdir $mountdir;
 	$img;
-    }
 }
 
 
@@ -781,7 +1065,7 @@ sub loadO {
 	my $o;
 	foreach (removable_media__early_in_install()) {
             my $dev = devices::make($_->{device});
-            foreach my $fs (arch() =~ /sparc/ ? 'romfs' : ('ext2', 'vfat')) {
+            foreach my $fs (qw(ext2 vfat ntfs-3g)) {
                 eval { fs::mount::mount($dev, '/mnt', $fs, 'readonly'); 1 } or next;
 		if (my $abs_f = find { -e $_ } "/mnt/$f", "/mnt/$f.pl") {
 		    $o = loadO_($O, $abs_f);
@@ -887,6 +1171,7 @@ sub generate_automatic_stage1_params {
 	$method = $1; #- in stage1, FTP via HTTP proxy is available through FTP config, not HTTP
 	@ks = (server => $2, directory => $3);
     } elsif ($o->{method} eq 'ftp') {
+	require install::ftp;
 	my @l = install::ftp::parse_ftp_url($ENV{URLPREFIX});
 	@ks = (server => $l[0], directory => $l[1], user => $l[2], pass => $l[3]);
     } elsif ($o->{method} eq 'nfs') {
@@ -1215,9 +1500,10 @@ sub screenshot_dir__and_move() {
     if (-e $dir0 && ! -e '/root/non-chrooted-marker.DrakX') {
 	($dir0, 'nowarn'); #- it occurs during pkgs install when we are chrooted
     } elsif (-e $dir1) {
-	if (-e "$dir2/DrakX-screenshots") {
-	    cp_af("$dir2/DrakX-screenshots", $dir1);
-	    rm_rf("$dir2/DrakX-screenshots");
+        my $path = "$dir2/DrakX-screenshots";
+	if (-e $path) {
+	    cp_af($path, $dir1);
+	    rm_rf($path);
 	}
 	$dir1;
     } else {
@@ -1235,7 +1521,10 @@ sub take_screenshot {
     }
     my $nb = 1;
     $nb++ while -e "$dir/$nb.png";
-    system("fb2png /dev/fb0 $dir/$nb.png 0");
+    run_program::run('fb2png', '-p', "$dir/$nb.png");
+
+    # help doesn't remember warning has been shown (one shot processes):
+    $warned ||= -e "$dir/2.png";
 
     if (!$warned && !$nowarn) {
 	$warned = 1;
@@ -1274,27 +1563,39 @@ sub remove_advertising() {
 }
 
 sub disable_user_view() {
-    substInFile { s/^UserView=.*/UserView=true/ } "$::prefix/etc/kde/kdm/kdmrc";
     substInFile { s/^Browser=.*/Browser=0/ } "$::prefix/etc/X11/gdm/custom.conf";
+    #TODO: Needed for sddm ?
 }
 
 sub set_security {
     my ($o) = @_;
     require security::various;
+    return if !-x "$::prefix/usr/sbin/msec";
     security::level::set($o->{security});
     security::various::config_security_user($::prefix, $o->{security_user});
 }
 
 sub write_fstab {
     my ($o) = @_;
-    fs::write_fstab($o->{all_hds}, $::prefix) 
-	if !$::local_install && (!$o->{isUpgrade} || $o->{isUpgrade} =~ /redhat|conectiva/ || $o->{migrate_device_names});
+    return if $::local_install || $o->{isUpgrade} && $o->{isUpgrade} !~ /redhat|conectiva/ && !$o->{migrate_device_names};
+    fs::write_fstab($o->{all_hds}, $::prefix);
 }
 
-sub adjust_files_mtime_to_timezone() {
-    #- to ensure linuxconf does not cry against those files being in the future
-    #- to ensure fc-cache works correctly on fonts installed after reboot
+=item adjust_files_mtime_to_timezone() {
+
+Fixes mtime of a couple important files according to timezone in order to:
+
+=over 4
 
+=item * to ensure linuxconf does not cry against those files being in the future
+
+=item * to ensure fc-cache works correctly on fonts installed after reboot
+
+=back
+
+=cut
+
+sub adjust_files_mtime_to_timezone() {
     my $timezone_shift = run_program::rooted_get_stdout($::prefix, 'date', '+%z');
     my ($h, $m) = $timezone_shift =~ /\+(..)(..)/ or return;
     my $now = time() - ($h * 60 + $m * 60) * 60;
@@ -1390,4 +1691,8 @@ sub configure_pcmcia {
     run_program::run("/lib/udev/pcmcia-socket-startup");
 }
 
+=back
+
+=cut
+
 1;
diff --git a/perl-install/install/commands.pm b/perl-install/install/commands.pm
index 55e1f103e..79f49b980 100644
--- a/perl-install/install/commands.pm
+++ b/perl-install/install/commands.pm
@@ -1,11 +1,11 @@
-package install::commands; # $Id: commands.pm 263616 2009-11-19 18:11:25Z blino $
+package install::commands;
 
 #-########################################################################
 #- This file implement many common shell commands:
-#- true, false, cat, which, dirname, basename, rmdir, lsmod, grep, tr,
+#- true, false, cat, which, dirname, basename, rmdir, grep, tr,
 #- mount, mkdir, mknod, ln, rm, chmod, chown, swapon,
 #- swapoff, ls, cp, ps, dd, head, tail, strings, hexdump, more,
-#- modprobe, route, df, kill, lspci, lssbus, dmesg, sort, du, 
+#- route, df, kill, lspci, lssbus, dmesg, sort, du, 
 #-########################################################################
 
 use diagnostics;
@@ -38,7 +38,6 @@ sub cat { @ARGV = @_; print while <> }
 sub dirname_ { print dirname(@_), "\n" }
 sub basename_ { print basename(@_), "\n" }
 sub rmdir_ { foreach (@_) { rmdir $_ or die "rmdir: cannot remove $_\n" } }
-sub lsmod() { print "Module                  Size  Used by\n"; cat("/proc/modules") }
 sub which { 
   ARG: foreach (@_) { foreach my $c (split /:/, $ENV{PATH}) { -x "$c/$_" and print("$c/$_\n"), next ARG } }
 }
@@ -276,7 +275,7 @@ sub hexdump {
 sub more {
     @ARGV = @_;
     require devices;
-    my $tty = devices::make('tty');
+    my $tty = '/dev/tty';
     my $n = 0; 
     open(my $IN, $tty) or die "cannot open $tty\n";
     local $_;
@@ -290,15 +289,6 @@ sub more {
     }
 }
 
-sub modprobe {
-    my ($h) = getopts(\@_, qw(h));
-    $h || @_ == 0 and die "usage: modprobe <module> [options]\n";
-    my $name = shift;
-    require modules;
-    list_modules::load_default_moddeps();
-    modules::load_with_options([ $name ], { $name => join(' ', @_) });
-}
-
 sub route {
     @_ == 0 or die "usage: route\nsorry, no modification handled\n";
     my ($titles, @l) = cat_("/proc/net/route");
@@ -411,8 +401,11 @@ sub bug {
 	my $in = interactive::stdio->new;
 
 	require install::any;
+	my @devs = install::any::removable_media__early_in_install();
+	@devs or die "You need to plug a removable medium (USB key, floppy, ...)\n";
+
 	$part = $in->ask_from_listf('', "Which device?", \&partition_table::description, 
-				    [ install::any::removable_media__early_in_install() ] ) or return;
+				    \@devs) or return;
     }
 
     warn "putting file report.bug on $part->{device}\n";
diff --git a/perl-install/install/ftp.pm b/perl-install/install/ftp.pm
index 4dcdae543..c69cdab25 100644
--- a/perl-install/install/ftp.pm
+++ b/perl-install/install/ftp.pm
@@ -1,4 +1,4 @@
-package install::ftp; # $Id: ftp.pm 215411 2007-04-25 12:26:16Z pixel $
+package install::ftp;
 
 use Net::FTP;
 
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index 1e80b6123..c83b8e6a7 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -1,10 +1,10 @@
-package install::gtk; # $Id: gtk.pm 269881 2010-06-04 14:48:46Z cfergeau $
+package install::gtk;
 
 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));
+	Gtk3::StyleContext::add_provider_for_screen(Gtk3::Gdk::Screen::get_default(), $pl, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION);
    }
 }
 
@@ -68,19 +71,21 @@ 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);
     }
 
-    Gtk2::Rc->parse_string(q(
-style "default-font" 
-{
-   font_name = ") . lang::l2pango_font($o->{locale}{lang}) . q("
-}
-widget "*" style "default-font"
-
+    my $font = lang::l2pango_font($o->{locale}{lang});
+    my $s = qq(gtk-font-name = $font);
+    my $pl = Gtk3::CssProvider->new;
+    $pl->load_from_data("GtkWindow { font: $font }");
+    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
 ));
 }
 
@@ -95,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;
 }
 
@@ -172,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) {
@@ -182,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
@@ -202,16 +206,15 @@ 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);
     ($::real_windowwidth, $::real_windowheight) = (576, 465);
 }
@@ -231,54 +234,38 @@ 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;
 }
 
 #------------------------------------------------------------------------------
 sub createXconf {
-    my ($file, $mouse_type, $mouse_dev, $_wacom_dev, $Driver) = @_;
-
-    $mouse_type = 'IMPS/2' if $mouse_type eq 'vboxmouse';
-    symlinkf(devices::make($mouse_dev), "/dev/mouse") if $mouse_dev ne 'none';
-
-    #- needed for imlib to start on 8-bit depth visual.
-    symlink("/tmp/stage2/etc/imrc", "/etc/imrc");
-    symlink("/tmp/stage2/etc/im_palette.pal", "/etc/im_palette.pal");
+    my ($file, $Driver) = @_;
 
     #- remove "error opening security policy file" warning
     symlink("/tmp/stage2/etc/X11", "/etc/X11");
 
-if ($Driver) {
-     my ($mouse_driver, $mouse_protocol) = detect_devices::is_vmware() ? qw(vmmouse auto) : ('mouse', $mouse_type);
-     output($file, sprintf(<<'END', $mouse_driver, $mouse_protocol, $Driver, $Driver eq 'fbdev' ? '"default"' : '"800x600" "640x480"'));
-Section "ServerFlags"
-   Option "AutoAddDevices" "False"
-EndSection
+    return if !$Driver;
 
-Section "Files"
-   FontPath   "/usr/share/fonts:unscaled"
+     # grub2-efi init framebuffer in 1024x768, we must stay in sync or loading fails
+     my $resolution = $Driver eq 'fbdev' ? is_uefi() ? '"1024x768"' : '"default"' : '"800x600" "640x480"';
+     # efi framebuffer wants 24 bit
+     my $depth = is_uefi() ? '24' : '16';
+     output($file, qq(Section "ServerFlags"
 EndSection
 
-Section "InputDevice"
-    Identifier "Keyboard"
-    Driver "keyboard"
-    Option "XkbModel" "pc105"
-    Option "XkbLayout" "us"
+Section "Module"
+      Disable "glx"
 EndSection
 
-Section "InputDevice"
-    Identifier "Mouse"
-    Driver "%s"
-    Option "Protocol" "%s"
-    Option "Device" "/dev/mouse"
-    Option "ZAxisMapping" "4 5"
+Section "Files"
+   FontPath   "/usr/share/fonts:unscaled"
 EndSection
 
 Section "Monitor"
@@ -289,17 +276,17 @@ EndSection
 
 Section "Device"
     Identifier  "device"
-    Driver      "%s"
+    Driver      "$Driver"
 EndSection
 
 Section "Screen"
     Identifier "screen"
     Device "device"
     Monitor "monitor"
-    DefaultColorDepth 16
+    DefaultColorDepth $depth
     Subsection "Display"
-        Depth 16
-        Modes %s
+        Depth $depth
+        Modes $resolution
     EndSubsection
 EndSection
 
@@ -310,12 +297,8 @@ Section "ServerLayout"
     Option "OffTime"     "0"
     Identifier "layout"
     Screen "screen"
-    InputDevice "Mouse" "CorePointer"
-    InputDevice "Keyboard" "CoreKeyboard"
 EndSection
-
-END
- }
+));
 }
 
 1;
diff --git a/perl-install/install/help/help.pm b/perl-install/install/help/help.pm
index 107527f8c..6215ad37f 100644
--- a/perl-install/install/help/help.pm
+++ b/perl-install/install/help/help.pm
@@ -12,7 +12,7 @@ push @::textdomains, 'DrakX-help';
 #            you want it changed.
 sub acceptLicense() {
     N("Before continuing, you should carefully read the terms of the license. It
-covers the entire Mageia Linux distribution. If you agree with all the
+covers the entire Mageia distribution. If you agree with all the
 terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"
 button will reboot your computer.", N("Accept"), N("Quit"));
 }
@@ -54,7 +54,7 @@ security), choose the desired user and window manager, then click on
 \"%s\". If you're not interested in this feature, uncheck the \"%s\" box.", N("User name"), N("Accept user"), N("Next"), N("Advanced"), N("Next"), N("Do you want to use this feature?"));
 }
 sub ask_mntpoint_s() {
-    N("Listed here are the existing Linux partitions detected on your hard drive.
+    N("Listed here are the existing Linux partitions detected on your hard disk drive.
 You can keep the choices made by the wizard, since they are good for most
 common installations. If you make any changes, you must at least define a
 root partition (\"/\"). Do not choose too small a partition or you will not
@@ -64,40 +64,40 @@ separate partition, you will also need to create a \"/home\" partition
 
 Each partition is listed as follows: \"Name\", \"Capacity\".
 
-\"Name\" is structured: \"hard drive type\", \"hard drive number\",
+\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",
 \"partition number\" (for example, \"hda1\").
 
-\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and
-\"sd\" if it is a SCSI hard drive.
+\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and
+\"sd\" if it is a SCSI hard disk drive.
 
-\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE
-hard drives:
+\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE
+hard disk drives:
 
- * \"a\" means \"master hard drive on the primary IDE controller\";
+ * \"a\" means \"master hard disk drive on the primary IDE controller\";
 
- * \"b\" means \"slave hard drive on the primary IDE controller\";
+ * \"b\" means \"slave hard disk drive on the primary IDE controller\";
 
- * \"c\" means \"master hard drive on the secondary IDE controller\";
+ * \"c\" means \"master hard disk drive on the secondary IDE controller\";
 
- * \"d\" means \"slave hard drive on the secondary IDE controller\".
+ * \"d\" means \"slave hard disk drive on the secondary IDE controller\".
 
-With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means
+With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means
 \"second lowest SCSI ID\", etc.");
 }
 sub chooseCd() {
-    N("The Mageia Linux installation is distributed on several CD-ROMs. If a
+    N("The %s installation is distributed on several CD-ROMs. If a
 selected package is located on another CD-ROM, DrakX will eject the current
 CD and ask you to insert the required one. If you do not have the requested
 CD at hand, just click on \"%s\", the corresponding packages will not be
-installed.", N("Cancel"));
+installed.", N("Mageia"), N("Cancel"));
 }
 sub choosePackages() {
     N("It's now time to specify which programs you wish to install on your system.
-There are thousands of packages available for Mageia Linux, and to make it
+There are thousands of packages available for Mageia, and to make it
 simpler to manage, they have been placed into groups of similar
 applications.
 
-Mageia Linux sorts package groups in four categories. You can mix and
+Mageia sorts package groups in four categories. You can mix and
 match applications from the various categories, so a ``Workstation''
 installation can still have applications from the ``Server'' category
 installed.
@@ -159,10 +159,10 @@ right to let you know the purpose of that package.
 !! If a server package has been selected, either because you specifically
 chose the individual package or because it was part of a group of packages,
 you'll be asked to confirm that you really want those servers to be
-installed. By default Mageia Linux will automatically start any installed
+installed. By default Mageia will automatically start any installed
 services at boot time. Even if they are safe and have no known issues at
 the time the distribution was shipped, it is entirely possible that
-security holes were discovered after this version of Mageia Linux was
+security holes were discovered after this version of Mageia was
 finalized. If you do not know what a particular service is supposed to do or
 why it's being installed, then click \"%s\". Clicking \"%s\" will install
 the listed services and they will be started automatically at boot time. !!
@@ -226,7 +226,7 @@ best suits your needs.");
 sub configureX_chooser() {
     N("X (for X Window System) is the heart of the GNU/Linux graphical interface
 on which all the graphical environments (KDE, GNOME, AfterStep,
-WindowMaker, etc.) bundled with Mageia Linux rely upon.
+WindowMaker, etc.) bundled with Mageia rely upon.
 
 You'll see a list of different parameters to change to get an optimal
 graphical display.
@@ -309,39 +309,39 @@ want to check \"%s\" if your machine is to act as a server, or if you were
 not successful in getting the display configured.", N("No"));
 }
 sub doPartitionDisks() {
-    N("You now need to decide where you want to install the Mageia Linux
-operating system on your hard drive. If your hard drive is empty or if an
+    N("You now need to decide where you want to install the %s 
+operating system on your hard disk drive. If your hard disk drive is empty or if an
 existing operating system is using all the available space you will have to
-partition the drive. Basically, partitioning a hard drive means to
+partition the drive. Basically, partitioning a hard disk drive means to
 logically divide it to create the space needed to install your new
-Mageia Linux system.
+Mageia system.
 
-Because the process of partitioning a hard drive is usually irreversible
+Because the process of partitioning a hard disk drive is usually irreversible
 and can lead to data losses, partitioning can be intimidating and stressful
 for the inexperienced user. Fortunately, DrakX includes a wizard which
 simplifies this process. Before continuing with this step, read through the
 rest of this section and above all, take your time.
 
-Depending on the configuration of your hard drive, several options are
+Depending on the configuration of your hard disk drive, several options are
 available:
 
  * \"%s\". This option will perform an automatic partitioning of your blank
 drive(s). If you use this option there will be no further prompts.
 
  * \"%s\". The wizard has detected one or more existing Linux partitions on
-your hard drive. If you want to use them, choose this option. You will then
+your hard disk drive. If you want to use them, choose this option. You will then
 be asked to choose the mount points associated with each of the partitions.
 The legacy mount points are selected by default, and for the most part it's
 a good idea to keep them.
 
- * \"%s\". If Microsoft Windows is installed on your hard drive and takes
+ * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes
 all the space available on it, you will have to create free space for
 GNU/Linux. To do so, you can delete your Microsoft Windows partition and
 data (see ``Erase entire disk'' solution) or resize your Microsoft Windows
 FAT or NTFS partition. Resizing can be performed without the loss of any
 data, provided you've previously defragmented the Windows partition.
 Backing up your data is strongly recommended. Using this option is
-recommended if you want to use both Mageia Linux and Microsoft Windows on
+recommended if you want to use both Mageia and Microsoft Windows on
 the same computer.
 
    Before choosing this option, please understand that after this
@@ -350,13 +350,13 @@ than when you started. You'll have less free space under Microsoft Windows
 to store your data or to install new software.
 
  * \"%s\". If you want to delete all data and all partitions present on
-your hard drive and replace them with your new Mageia Linux system, choose
+your hard disk drive and replace them with your new Mageia system, choose
 this option. Be careful, because you will not be able to undo this operation
 after you confirm.
 
    !! If you choose this option, all data on your disk will be deleted. !!
 
- * \"%s\". This option appears when the hard drive is entirely taken by
+ * \"%s\". This option appears when the hard disk drive is entirely taken by
 Microsoft Windows. Choosing this option will simply erase everything on the
 drive and begin fresh, partitioning everything from scratch.
 
@@ -367,7 +367,8 @@ drive. Be careful -- it is a powerful but dangerous choice and you can very
 easily lose all your data. That's why this option is really only
 recommended if you have done something like this before and have some
 experience. For more instructions on how to use the DiskDrake utility,
-refer to the ``Managing Your Partitions'' section in the ``Starter Guide''.", N("Use free space"), N("Use existing partition"), N("Use the free space on the Microsoft Windows® partition"), N("Erase entire disk"), N("Remove Microsoft Windows®"), N("Custom disk partitioning"));
+refer to the ``Managing Your Partitions'' section in the ``Starter Guide''.",
+N("Mageia"), N("Use free space"), N("Use existing partition"), N("Use the free space on the Microsoft Windows® partition"), N("Erase entire disk"), N("Remove Microsoft Windows®"), N("Custom disk partitioning"));
 }
 sub exitInstall() {
     N("There you are. Installation is now complete and your GNU/Linux system is
@@ -421,13 +422,13 @@ will not be able to recover it.
 Click on \"%s\" when you're ready to format the partitions.
 
 Click on \"%s\" if you want to choose another partition for your new
-Mageia Linux operating system installation.
+Mageia operating system installation.
 
 Click on \"%s\" if you wish to select partitions which will be checked for
 bad blocks on the disk.", N("Next"), N("Previous"), N("Advanced"));
 }
 sub installUpdates() {
-    N("By the time you install Mageia Linux, it's likely that some packages will
+    N("By the time you install %s, it's likely that some packages will
 have been updated since the initial release. Bugs may have been fixed,
 security issues resolved. To allow you to benefit from these updates,
 you're now able to download them from the Internet. Check \"%s\" if you
@@ -437,7 +438,7 @@ updated packages later.
 Choosing \"%s\" will display a list of web locations from which updates can
 be retrieved. You should choose one near to you. A package-selection tree
 will appear: review the selection, and press \"%s\" to retrieve and install
-the selected package(s), or \"%s\" to abort.", N("Yes"), N("No"), N("Yes"), N("Install"), N("Cancel"));
+the selected package(s), or \"%s\" to abort.", N("Mageia"), N("Yes"), N("No"), N("Yes"), N("Install"), N("Cancel"));
 }
 sub miscellaneous() {
     N("At this point, DrakX will allow you to choose the security level you desire
@@ -447,7 +448,7 @@ exposed to the Internet. The trade-off that a higher security level is
 generally obtained at the expense of ease of use.
 
 If you do not know what to choose, keep the default option. You'll be able
-to change it later with the draksec tool, which is part of Mageia Linux
+to change it later with the draksec tool, which is part of Mageia
 Control Center.
 
 Fill the \"%s\" field with the e-mail address of the person responsible for
@@ -455,21 +456,21 @@ security. Security messages will be sent to that address.", N("Security Administ
 }
 sub partition_with_diskdrake() {
     N("At this point, you need to choose which partition(s) will be used for the
-installation of your Mageia Linux system. If partitions have already been
+installation of your Mageia system. If partitions have already been
 defined, either from a previous installation of GNU/Linux or by another
-partitioning tool, you can use existing partitions. Otherwise, hard drive
+partitioning tool, you can use existing partitions. Otherwise, hard disk drive
 partitions must be defined.
 
-To create partitions, you must first select a hard drive. You can select
+To create partitions, you must first select a hard disk drive. You can select
 the disk for partitioning by clicking on ``hda'' for the first IDE drive,
 ``hdb'' for the second, ``sda'' for the first SCSI drive and so on.
 
-To partition the selected hard drive, you can use these options:
+To partition the selected hard disk drive, you can use these options:
 
- * \"%s\": this option deletes all partitions on the selected hard drive
+ * \"%s\": this option deletes all partitions on the selected hard disk drive
 
- * \"%s\": this option enables you to automatically create ext3 and swap
-partitions in the free space of your hard drive
+ * \"%s\": this option enables you to automatically create ext4 and swap
+partitions in the free space of your hard disk drive
 
 \"%s\": gives access to additional features:
 
@@ -485,21 +486,21 @@ using this option. Please be careful and remember that it does not always
 work.
 
  * \"%s\": discards all changes and reloads the partition table that was
-originally on the hard drive.
+originally on the hard disk drive.
 
  * \"%s\": un-checking this option will force users to manually mount and
 unmount removable media such as floppies and CD-ROMs.
 
  * \"%s\": use this option if you wish to use a wizard to partition your
-hard drive. This is recommended if you do not have a good understanding of
+hard disk drive. This is recommended if you do not have a good understanding of
 partitioning.
 
  * \"%s\": use this option to cancel your changes.
 
  * \"%s\": allows additional actions on partitions (type, options, format)
-and gives more information about the hard drive.
+and gives more information about the hard disk drive.
 
- * \"%s\": when you are finished partitioning your hard drive, this will
+ * \"%s\": when you are finished partitioning your hard disk drive, this will
 save your changes back to disk.
 
 When defining the size of a partition, you can finely set the partition
@@ -516,44 +517,39 @@ When a partition is selected, you can use:
 
  * Ctrl-m to set the mount point
 
-To get information about the different file system types available, please
+To get information about the different filesystem types available, please
 read the ext2FS chapter from the ``Reference Manual''.
-
-If you are installing on a PPC machine, you will want to create a small HFS
-``bootstrap'' partition of at least 1MB which will be used by the yaboot
-bootloader. If you opt to make the partition a bit larger, say 50MB, you
-may find it a useful place to store a spare kernel and ramdisk images for
-emergency boot situations.", N("Clear all"), N("Auto allocate"), N("More"), N("Save partition table"), N("Restore partition table"), N("Rescue partition table"), N("Reload partition table"), N("Removable media auto-mounting"), N("Wizard"), N("Undo"), N("Toggle between normal/expert mode"), N("Done"));
+", N("Clear all"), N("Auto allocate"), N("More"), N("Save partition table"), N("Restore partition table"), N("Rescue partition table"), N("Reload partition table"), N("Removable media auto-mounting"), N("Wizard"), N("Undo"), N("Toggle between normal/expert mode"), N("Done"));
 }
 sub resizeFATChoose() {
-    N("More than one Microsoft partition has been detected on your hard drive.
+    N("More than one Microsoft partition has been detected on your hard disk drive.
 Please choose the one which you want to resize in order to install your new
-Mageia Linux operating system.
+Mageia operating system.
 
 Each partition is listed as follows: \"Linux name\", \"Windows name\"
 \"Capacity\".
 
-\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",
+\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",
 \"partition number\" (for example, \"hda1\").
 
-\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and
-\"sd\" if it is a SCSI hard drive.
+\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and
+\"sd\" if it is a SCSI hard disk drive.
 
-\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE
-hard drives:
+\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE
+hard disk drives:
 
- * \"a\" means \"master hard drive on the primary IDE controller\";
+ * \"a\" means \"master hard disk drive on the primary IDE controller\";
 
- * \"b\" means \"slave hard drive on the primary IDE controller\";
+ * \"b\" means \"slave hard disk drive on the primary IDE controller\";
 
- * \"c\" means \"master hard drive on the secondary IDE controller\";
+ * \"c\" means \"master hard disk drive on the secondary IDE controller\";
 
- * \"d\" means \"slave hard drive on the secondary IDE controller\".
+ * \"d\" means \"slave hard disk drive on the secondary IDE controller\".
 
-With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means
+With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means
 \"second lowest SCSI ID\", etc.
 
-\"Windows name\" is the letter of your hard drive under Windows (the first
+\"Windows name\" is the letter of your hard disk drive under Windows (the first
 disk or partition is called \"C:\").");
 }
 sub selectCountry() {
@@ -566,22 +562,22 @@ sub selectInstallClass() {
 found on your machine.
 
 DrakX now needs to know if you want to perform a new installation or an
-upgrade of an existing Mageia Linux system:
+upgrade of an existing Mageia system:
 
  * \"%s\". For the most part, this completely wipes out the old system.
 However, depending on your partitioning scheme, you can prevent some of
 your existing data (notably \"home\" directories) from being over-written.
-If you wish to change how your hard drives are partitioned, or to change
-the file system, you should use this option.
+If you wish to change how your hard disk drives are partitioned, or to change
+the filesystem, you should use this option.
 
  * \"%s\". This installation class allows you to update the packages
-currently installed on your Mageia Linux system. Your current partitioning
+currently installed on your Mageia system. Your current partitioning
 scheme and user data will not be altered. Most of the other configuration
 steps remain available and are similar to a standard installation.
 
-Using the ``Upgrade'' option should work fine on Mageia Linux systems
+Using the ``Upgrade'' option should work fine on Mageia systems
 running version \"8.1\" or later. Performing an upgrade on versions prior
-to Mageia Linux version \"8.1\" is not recommended.", N("Install"), N("Upgrade"));
+to Mageia version \"8.1\" is not recommended.", N("Install"), N("Upgrade"));
 }
 sub selectKeyboard() {
     N("Depending on the language you chose (), DrakX will automatically select a
@@ -616,7 +612,7 @@ the tree view and \"%s\" in the Advanced section.
 
 About UTF-8 (unicode) support: Unicode is a new character encoding meant to
 cover all existing languages. However full support for it in GNU/Linux is
-still under development. For that reason, Mageia Linux's use of UTF-8 will
+still under development. For that reason, Mageia's use of UTF-8 will
 depend on the user's choices:
 
  * If you choose a language with a strong legacy encoding (latin1
@@ -699,7 +695,7 @@ know what you're doing.", N("First sector of drive (MBR)"), N("Skip"));
 }
 sub setupDefaultSpooler() {
     N("Now, it's time to select a printing system for your computer. Other
-operating systems may offer you one, but Mageia Linux offers two. Each of
+operating systems may offer you one, but Mageia offers two. Each of
 the printing systems is best suited to particular types of configuration.
 
  * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice
@@ -720,7 +716,7 @@ emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.
 options and for managing the printer.
 
 If you make a choice now, and later find that you do not like your printing
-system you may change it by running PrinterDrake from the Mageia Linux
+system you may change it by running PrinterDrake from the Mageia
 Control Center and clicking on the \"%s\" button.", N("pdq"), N("pdq"), N("CUPS"), N("CUPS"), N("Expert"));
 }
 sub setupSCSI() {
@@ -729,7 +725,7 @@ also scan for one or more PCI SCSI cards on your system. If a SCSI card is
 found, DrakX will automatically install the appropriate driver.
 
 Because hardware detection is not foolproof, DrakX may fail in detecting
-your hard drives. If so, you'll have to specify your hardware by hand.
+your hard disk drives. If so, you'll have to specify your hardware by hand.
 
 If you had to manually specify your PCI SCSI adapter, DrakX will ask if you
 want to configure options for it. You should allow DrakX to probe the
@@ -785,7 +781,7 @@ the card if you feel the configuration is wrong.
 
  * \"%s\": if you wish to configure your Internet or local network access,
 you can do so now. Refer to the printed documentation or use the
-Mageia Linux Control Center after the installation has finished to benefit
+Mageia Control Center after the installation has finished to benefit
 from full in-line help.
 
  * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine
@@ -802,23 +798,23 @@ firewall settings.
  * \"%s\": if you wish to change your bootloader configuration, click this
 button. This should be reserved to advanced users. Refer to the printed
 documentation or the in-line help about bootloader configuration in the
-Mageia Linux Control Center.
+Mageia Control Center.
 
  * \"%s\": through this entry you can fine tune which services will be run
 on your machine. If you plan to use this machine as a server it's a good
 idea to review this setup.", N("Configure"), N("Keyboard"), N("Country / Region"), N("Configure"), N("More"), N("Timezone"), N("Configure"), N("Mouse"), N("Sound card"), N("TV card"), N("Configure"), N("ISDN card"), N("Configure"), N("Graphical Interface"), N("Configure"), N("Network"), N("Proxies"), N("Security Level"), N("Firewall"), N("Bootloader"), N("Services"));
 }
 sub takeOverHdChoose() {
-    N("Choose the hard drive you want to erase in order to install your new
-Mageia Linux partition. Be careful, all data on this drive will be lost
+    N("Choose the hard disk drive you want to erase in order to install your new
+Mageia partition. Be careful, all data on this drive will be lost
 and will not be recoverable!");
 }
 sub takeOverHdConfirm() {
     N("Click on \"%s\" if you want to delete all data and partitions present on
-this hard drive. Be careful, after clicking on \"%s\", you will not be able
-to recover any data and partitions present on this hard drive, including
+this hard disk drive. Be careful, after clicking on \"%s\", you will not be able
+to recover any data and partitions present on this hard disk drive, including
 any Windows data.
 
 Click on \"%s\" to quit this operation without losing data and partitions
-present on this hard drive.", N("Next ->"), N("Next ->"), N("<- Previous"));
+present on this hard disk drive.", N("Next ->"), N("Next ->"), N("<- Previous"));
 }
diff --git a/perl-install/install/help/po/.gitignore b/perl-install/install/help/po/.gitignore
new file mode 100644
index 000000000..cd1f2c943
--- /dev/null
+++ b/perl-install/install/help/po/.gitignore
@@ -0,0 +1 @@
+*.mo
diff --git a/perl-install/install/help/po/DrakX-help.pot b/perl-install/install/help/po/DrakX-help.pot
index c5002c613..48524b132 100644
--- a/perl-install/install/help/po/DrakX-help.pot
+++ b/perl-install/install/help/po/DrakX-help.pot
@@ -84,7 +84,7 @@ msgstr ""
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -94,24 +94,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -409,31 +409,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -449,7 +449,7 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, "
+"your hard disk drive and replace them with your new Mageia system, "
 "choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
@@ -457,7 +457,7 @@ msgid ""
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -614,19 +614,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -642,21 +642,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -673,14 +673,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -721,34 +715,34 @@ msgstr ""
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -773,8 +767,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current "
@@ -931,7 +925,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -990,7 +984,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1095,7 +1089,7 @@ msgstr ""
 #: ../help.pm:861
 #, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1104,12 +1098,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 
 #: ../help.pm:872
diff --git a/perl-install/install/help/po/af.po b/perl-install/install/help/po/af.po
index 3b6ad45e3..e8061be6c 100644
--- a/perl-install/install/help/po/af.po
+++ b/perl-install/install/help/po/af.po
@@ -139,7 +139,7 @@ msgstr "Wil u hierdie funksie gebruik?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -149,24 +149,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Hier is 'n lys van die bestaande Linux partisies wat opgespoor is.\n"
@@ -670,31 +670,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -710,14 +710,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1004,19 +1004,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1032,21 +1032,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1063,14 +1063,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Nou moet u asseblief besluit watter partisie(s) u gaan gebruik vir die\n"
 "installasie van u Mageia rekenaar.Indien die partisies reeds\n"
@@ -1086,7 +1080,7 @@ msgstr ""
 "\n"
 " * \"%s\": hierdie opsie wis alle partisies op die gekose skyf uit.\n"
 "\n"
-" * \"%s\": hierdie opsie sal outomaties 'ext3' en 'swap' partisies in die\n"
+" * \"%s\": hierdie opsie sal outomaties 'ext4' en 'swap' partisies in die\n"
 "vrye spasie op die hardeskyf skep.\n"
 "\n"
 "\"%s\": gee u toegang tot verdere keuses:\n"
@@ -1136,11 +1130,6 @@ msgstr ""
 "Om inligting rakende die verskillende beskikbare lêerstelsels te bekom, "
 "lees\n"
 "asseblief die ext2FS hoofstuk in die \"Reference Manual\".\n"
-"\n"
-"Indien u op 'n PPC masjien installeer, sal u 'n klien HFS 'bootstrap'\n"
-"partisie van ten minste 1MB wil skep. Dit sal deur 'yaboot' herlaai-\n"
-" stelsel gebruik word. Maak dit bietjie groter vir spaar 'kernel' en\n"
-"'ramdisk' beelde vir hulp in nood situasies."
 
 #: ../help.pm:526
 #, c-format
@@ -1180,34 +1169,34 @@ msgstr "Skakel tussen normale/kenner modus"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Ons het meer as een Microsoft-partisie op u hardeskyf gevind.\n"
@@ -1266,8 +1255,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1510,7 +1499,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1604,7 +1593,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1778,7 +1767,7 @@ msgstr "Grafiese koppelvlak"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1790,12 +1779,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Klik op \"%s\" sou u al die data an al die partisies wat tans op hierdie\n"
 "hardeskyf is wil uitwis. Wees versigtig! Na u \"%s\" geklik het, sal u nie\n"
diff --git a/perl-install/install/help/po/am.po b/perl-install/install/help/po/am.po
index 1e95f833d..442f9ea69 100644
--- a/perl-install/install/help/po/am.po
+++ b/perl-install/install/help/po/am.po
@@ -82,7 +82,7 @@ msgstr "ይህንን �ኔታ መጠቀ� ይ��ጋሉ?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -92,24 +92,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -406,31 +406,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -446,14 +446,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -610,19 +610,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -638,21 +638,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -669,14 +669,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -717,34 +711,34 @@ msgstr ""
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -769,8 +763,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -925,7 +919,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -984,7 +978,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1088,7 +1082,7 @@ msgstr "ንድ�ዊ እይታ"
 #: ../help.pm:861
 #, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1097,12 +1091,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 
 #: ../help.pm:872
diff --git a/perl-install/install/help/po/ar.po b/perl-install/install/help/po/ar.po
index 147a717b1..560ed1709 100644
--- a/perl-install/install/help/po/ar.po
+++ b/perl-install/install/help/po/ar.po
@@ -131,7 +131,7 @@ msgstr "هل تريد استخدام هذه الميزة؟"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -141,24 +141,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "�ي الأعلى ستجد تجزيئات لينكس الموجودة والتي عثر عليها على القرص الصلب الخاص "
@@ -686,31 +686,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -726,14 +726,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1026,19 +1026,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1054,21 +1054,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1085,14 +1085,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "عند هذه النقطة، تحتاج لاختيار أي التجزيئات ستستخدم\n"
 "لتثبيت نظام ماندريبا لينكس. إن كانت التجزيئات بال�عل\n"
@@ -1108,7 +1102,7 @@ msgstr ""
 "\n"
 " * \"%s\": هذا الخيار يحذ� كل التجزيئات على القرص الصّلب المحدّد\n"
 "\n"
-" * \"%s\": هذا الخيار يمكّنك من إنشاء تجزيئات ext3 والذّاكرة البديلة آليّاً\n"
+" * \"%s\": هذا الخيار يمكّنك من إنشاء تجزيئات ext4 والذّاكرة البديلة آليّاً\n"
 "�ي المساحة الشّاغرة لقرصك الصّلب\n"
 "\n"
 " * %s: يعطي حقّ الوصول إلى مزايا إضا�يّة:\n"
@@ -1159,13 +1153,6 @@ msgstr ""
 "\n"
 "لتحصل على معلومات حول أنواع أنظمة المل�ّات المختل�ة المتو�ّرة، رجاءً\n"
 "اقرا �َصْل ext2FS من ``الدّليل المرجعي``.\n"
-"\n"
-"إن كنت تقوم بالتّثبيت على ماكينة PPC، ستحتاج أن تنشئ تجزيء HFS\n"
-"``bootstrap`` صغير بحجم 1 ميجابايت على الأقلّ والذي سيستخدم بواسطة م�حمّل "
-"الإقلاع  yaboot.\n"
-"إن اخترت أن تجعل التجزيء أكبر قليلاً، لنقل 50 ميجابايت، قد تجده\n"
-"م�يد لتخزين نواة احتياطية وصور ramdisk من أجل\n"
-"أوضاع الإقلاع الطّارئة."
 
 #: ../help.pm:526
 #, c-format
@@ -1205,34 +1192,34 @@ msgstr "التغيير إلى الوضع العادي/وضع الخبير"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "تمّ اكتشا� أكثر من تجزيء ميكروسو�ت على قرصك الصّلب.\n"
@@ -1289,8 +1276,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1557,7 +1544,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1658,7 +1645,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1848,7 +1835,7 @@ msgstr "الواجهة الرسومية"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1860,12 +1847,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "اضغط \"%s\" إن كنت تريد حذ� كل التجزيئات الموجودة على القرص\n"
 "الصلب. خذ حذرك، بعد ضغطك لزر \"%s\" لن تتمكن من استعادة\n"
diff --git a/perl-install/install/help/po/az.po b/perl-install/install/help/po/az.po
index 8b5cce189..a0f1b6efb 100644
--- a/perl-install/install/help/po/az.po
+++ b/perl-install/install/help/po/az.po
@@ -140,7 +140,7 @@ msgstr "Bu xüsusiyyəti istifadə etmək istəyirsiniz?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -150,24 +150,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Burada sürücünüzdə tapılan Linuks bölmələri sıralanıb.\n"
@@ -712,31 +712,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -752,14 +752,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1064,19 +1064,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1092,21 +1092,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1123,14 +1123,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Bu nöqtədə siz Mageia yüklənəcək bölmə(lər)i seçməlisiniz. �gər\n"
 "bölmələr əvvəldən mövcuddursa (sistemdə əvvəllər qurulu olan GNU/Linuks \n"
@@ -1148,7 +1142,7 @@ msgstr ""
 " * \"%s\": Bu seçim seçili sabit disk üstündəki bütün bölmələri silər\n"
 "\n"
 " * \"%s\": Bu seçim sizə avtomatik olaraq sabit diskinizin boş sahəsində\n"
-"ext3 və dəyiş-toqquş sahəsi yaratma imkanı verəcək\n"
+"ext4 və dəyiş-toqquş sahəsi yaratma imkanı verəcək\n"
 "\n"
 "\"%s\": �lavə xüsusiyyətlərə yetişmə imkanı verir\n"
 "\n"
@@ -1205,12 +1199,6 @@ msgstr ""
 "Fərqli fayl sistem növləri haqqında daha ətraflı mə'lumat üçün, xahiş "
 "edirik,\n"
 "``Reference Manual'' kitabının ext2FS bölümünü oxuyun.\n"
-"\n"
-"�gər PPC kompüterdə qurulum aparırsınızsa, ən az 1 MBlıq balaca bir HFS \n"
-"``bootstrap'' bölməsini yaboot açılış yükləyicisi üçün seçmək "
-"istəyəcəksiniz.\n"
-"�gər daha çox yeriniz varsa, məsələn 50 MB, onda bütün kernel və ramdisk \n"
-"açılış əkslərinizi təcili hallar üçün burada saxlaya bilərsiniz."
 
 #: ../help.pm:526
 #, c-format
@@ -1250,34 +1238,34 @@ msgstr "Normal modla mütəxəssis modu arasında keç"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Sürücünüzdə bir və ya daha çox Microsoft bölməsi tapıldı.\n"
@@ -1335,8 +1323,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1572,7 +1560,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1672,7 +1660,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1858,7 +1846,7 @@ msgstr "Qrafiki Ara Ãœz"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1870,12 +1858,12 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Sürücüdəki bütün mə'lumatları və bölmələri silmək üçün\n"
 "\"%s\" düyməsinə basın. Diqqətli olun,\"%s\" düyməsinə basdıqdan sonra\n"
diff --git a/perl-install/install/help/po/be.po b/perl-install/install/help/po/be.po
index 459ade0c3..c8decfcc3 100644
--- a/perl-install/install/help/po/be.po
+++ b/perl-install/install/help/po/be.po
@@ -82,7 +82,7 @@ msgstr "Вы жадаеце выкары�тоўваць aboot?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -92,24 +92,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -406,31 +406,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -446,14 +446,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -610,19 +610,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -638,21 +638,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -669,14 +669,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -717,34 +711,34 @@ msgstr "Звычайны р�жым"
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -769,8 +763,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -925,7 +919,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -984,7 +978,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1088,7 +1082,7 @@ msgstr "Запу�к X пры �тарце �і�т�мы"
 #: ../help.pm:861
 #, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1097,12 +1091,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 
 #: ../help.pm:872
diff --git a/perl-install/install/help/po/bg.po b/perl-install/install/help/po/bg.po
index 9d8f15e97..ed19a7912 100644
--- a/perl-install/install/help/po/bg.po
+++ b/perl-install/install/help/po/bg.po
@@ -14,6 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2004-09-15 13:27+0200\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,8 +31,7 @@ msgid ""
 msgstr ""
 "Преди да продължите, тр�бва внимателно да прочетете у�лови�та на лиценза. "
 "Той\n"
-"покрива ц�лата Mageia ди�трибуци�, и, ако �те �ъгла�ни � в�ички "
-"у�лови�\n"
+"покрива ц�лата Mageia ди�трибуци�, и, ако �те �ъгла�ни � в�ички у�лови�\n"
 "в него, �ложете отметка на \"%s\".�ко не �те �ъгла�ни,про�то �прете "
 "компютъра �и."
 
@@ -137,7 +137,8 @@ msgstr "И�кате ли да използвате тази о�обено�т?
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -147,24 +148,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "По-горе �а изброени за�ечените Linux д�лове �ъще�твуващи\n"
@@ -384,8 +389,7 @@ msgstr ""
 "\n"
 "!! �ко е избран �ървърен пакет, било то умишлено или защото е ча�т от ц�ла\n"
 "група, ще бъдете помолени за потвърждение, че наи�тина и�кате този �ървър\n"
-"да бъде ин�талиран. В Mageia, в�ички �ървъри тръгват по "
-"подразбиране\n"
+"да бъде ин�талиран. В Mageia, в�ички �ървъри тръгват по подразбиране\n"
 "при зареждане.Даже ако �а �игурни и н�мат изве�тни проблеми, когато\n"
 "ди�трибуци�та �е разпро�тран�ва, може да �е �лучи така, че да �е по�в�т\n"
 "дупки в �игурно�тта, �лед като вер�и�та на Mageia е завършена. �ко\n"
@@ -600,31 +604,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -640,14 +648,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -948,19 +957,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -976,21 +988,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1007,14 +1021,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "В този момент тр�бва да изберете кой д�лове да бъдат използвани за "
 "ин�талаци�\n"
@@ -1075,13 +1083,6 @@ msgstr ""
 " * Ctrl-d, за да изтриете д�л;\n"
 "\n"
 " * Ctrl-m, за да у�тановите точка на монтиране.\n"
-"\n"
-"�ко ин�талите на PPC машина, �игурно ще и�кате да �ъздадете малък HFS\n"
-"\"bootstrap\" д�л от поне 1 МБ, който ще бъде използват от boot loader-ът\n"
-"yaboot. �ко �м�тате да направите д�ла по-гол�м, например 50 МБ, можете да "
-"го\n"
-"намерите за полезно м��то, където да �ъхран�вате н�кое �дро или image на\n"
-"ramdisk в �лучай на извънредни �итуации."
 
 #: ../help.pm:526
 #, c-format
@@ -1121,34 +1122,40 @@ msgstr "Премини в нормален/ек�пертен режим"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Беше за�ечен повече от един Microsoft Windows д�л\n"
@@ -1207,8 +1214,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1409,7 +1417,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1494,7 +1502,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1601,25 +1609,27 @@ msgstr "Графичен интерфей�"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
 "Изберете твърди� ди�к, който и�кате да изтриете, за да\n"
-"ин�талирам нови� ви Mageia д�л. Внимание, в�ички данни на него ще "
-"бъдат загубени\n"
+"ин�талирам нови� ви Mageia д�л. Внимание, в�ички данни на него ще бъдат "
+"загубени\n"
 "и н�ма да могат да �е въз�танов�т."
 
 #: ../help.pm:866
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Цъкнете на \"%s\", ако и�кате да изтриете в�ички данни и\n"
 "д�лове �ъще�твуващи на този твърд ди�к. Внимание, �лед цъкане на \"%s\", "
diff --git a/perl-install/install/help/po/bn.po b/perl-install/install/help/po/bn.po
index 56e79648e..90208f3c6 100644
--- a/perl-install/install/help/po/bn.po
+++ b/perl-install/install/help/po/bn.po
@@ -135,7 +135,7 @@ msgstr "à¦�ই সà§�বিধাটি কি আপনি বà§�যবহাà¦
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -145,24 +145,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "আপনার হার�ড ড�রাইভে বর�তমানে নিম�নলিখিত লিনাক�স পার�টিশনগ�লো বিদ�যমান।\n"
@@ -602,31 +602,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -642,14 +642,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -851,19 +851,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -879,21 +879,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -910,14 +910,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "�ই সময়ে আপনাকে Mageia যে পার�টিশনে ইনস�টল হবে তা নির�বাচন\n"
 "করতে হবে। যদি আগে থেকেই পার�টিশন তৈরী থাকে, (GNU/Linux �র প�র�বের\n"
@@ -932,7 +926,7 @@ msgstr ""
 "\n"
 " * \"%s\": �ই অপশনটি  নির�বাচিত ড�রাইভের সব পার�টিশন ম�ছে দিবে\n"
 "\n"
-" * \"%s\": �ই অপশনটি  আপনার হার�ডড�রাইভের খালি অংশে স�বয়ংক�রিয়ভাবে ext3 �বং\n"
+" * \"%s\": �ই অপশনটি  আপনার হার�ডড�রাইভের খালি অংশে স�বয়ংক�রিয়ভাবে ext4 �বং\n"
 "swap পার�টিশন তৈরী করতে দিবে।\n"
 "\n"
 "\"%s\": আরও ফিচার ব�যবহার করার স�যোগ দেয়:\n"
@@ -980,12 +974,6 @@ msgstr ""
 "\n"
 "বিদ�যমান ফাইল সিস�টেমের ধরন সম�পর�কে জানতে হলে \"Reference Manual\" �র\n"
 "ext2FS অধ�যায়টি পড়�ন।\n"
-"\n"
-"আপনি যদি PPC মেশিনে ইনস�টল করেন, তাহলে আপনাকে yaboot ব�টলোডারের\n"
-"ব�যবহারের জন�য �কটি  ছোট অন�তত ১ �মবি �র HFS \"ব�টস�ট�র�যাপ\" পার�টিশন তৈরী করতে "
-"হবে।\n"
-"আপনি যদি পার�টিশনটি আরও বড় করতে চান, যেমন ৫০ MB, আপনি কোন জর�রী ব�ট সমস�যার\n"
-"জন�য �কটি আলাদা কার�নেল �বং ramdisk তৈরী করে �ই পার�টিশনে রাখতে পারেন।"
 
 #: ../help.pm:526
 #, c-format
@@ -1027,34 +1015,34 @@ msgstr "সাধারণ/দকà§�ষ মোডের মধà§�যে পরà¦
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "আপনার হার�ড ড�রাইভে বর�তমানে নিম�নলিখিত লিনাক�স পার�টিশনগ�লো বিদ�যমান।\n"
@@ -1114,8 +1102,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1290,7 +1278,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1384,7 +1372,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1507,7 +1495,7 @@ msgstr "গ�রাফিকাল ইন�টারফেস"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1520,12 +1508,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "যদি �ই হার�ড ড�রাইভে থাকা সব ডাটা �বং পার�টিশন ম�ছে ফেলতে চান তাহলে আপনি\n"
 "\"%s\"তে ক�লিক কর�ন। সাবধান, \"%s\"তে ক�লিক করার পর, উইন�ডোজ ডাটাসহ,\n"
diff --git a/perl-install/install/help/po/br.po b/perl-install/install/help/po/br.po
index 386dfbb00..62a4b0104 100644
--- a/perl-install/install/help/po/br.po
+++ b/perl-install/install/help/po/br.po
@@ -1,6 +1,6 @@
 # DrakX e Brezhoneg.
 # Copyright (C) 1999-2005 Mandriva
-# Thierry Vignaud <tvignaud@mandriva.com>, 1999-2005
+# Thierry Vignaud <thierry.vignaud.com>, 1999-2005
 # Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>, 1999-2000
 #
 msgid ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-12 12:22+0200\n"
 "PO-Revision-Date: 2006-04-06 19:37+0200\n"
-"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
+"Last-Translator: Thierry Vignaud <thierry.vignaud.com>\n"
 "Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,7 +84,7 @@ msgstr "Mennout a rit implijout an arc'hwel-mañ ?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -94,24 +94,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -416,31 +416,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -456,14 +456,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -620,19 +620,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -648,21 +648,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -679,14 +679,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -727,34 +721,34 @@ msgstr "Tremen er mod boas/mailh"
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -779,8 +773,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -937,7 +931,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -996,7 +990,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1100,7 +1094,7 @@ msgstr "Ketal Kevregañ"
 #: ../help.pm:861
 #, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1109,12 +1103,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 
 #: ../help.pm:872
diff --git a/perl-install/install/help/po/bs.po b/perl-install/install/help/po/bs.po
index 659b8a845..62fc3cbbf 100644
--- a/perl-install/install/help/po/bs.po
+++ b/perl-install/install/help/po/bs.po
@@ -138,7 +138,7 @@ msgstr "Da li želite koristiti ovu mogućnost?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -148,24 +148,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Ovdje su navedene Linux particije koje već postoje na vašem hard disku.\n"
@@ -706,31 +706,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -746,14 +746,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1050,19 +1050,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1078,21 +1078,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1109,14 +1109,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Sada trebate izabrati koje particije želite koristiti za instalaciju vašeg\n"
 "Mageia sistema. Ako su particije već definisane, iz prijašnje\n"
@@ -1133,7 +1127,7 @@ msgstr ""
 "\n"
 " * \"%s\": ova opcija briše sve particije na izabranom hard disku\n"
 "\n"
-" * \"%s\": ova opcija vam omogućuje da automatski napravite ext3\n"
+" * \"%s\": ova opcija vam omogućuje da automatski napravite ext4\n"
 "i swap particije u slobodnom prostoru vašeg hard diska\n"
 "\n"
 "\"%s\" omogućuje pristup dodatnim mogućnostima:\n"
@@ -1184,12 +1178,6 @@ msgstr ""
 "\n"
 "Da biste dobili informacije o raznim tipovima datote�nog sistema koji\n"
 "su dostupni, pro�itajte poglavlje o ext2FS iz ''Referentnog priru�nika''.\n"
-"\n"
-"Ako instalirate na PPC ra�unar, trebate napraviti malu HFS ''bootstrap''\n"
-"particiju od najmanje 1 MB koju će koristiti yaboot bootloader. Ako se\n"
-"odlu�ite da ovu particiju u�inite nešto većom, npr. 50 MB, primjetićete\n"
-"da je ona korisno mjesto za �uvanje rezervnog kernela ili ramdisk slika\n"
-"za hitne slu�ajeve."
 
 #: ../help.pm:526
 #, c-format
@@ -1229,34 +1217,34 @@ msgstr "Prekida� normalnog/ekspertnog moda"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Na vašem hard disku ustanovljeno je više od jedne Microsoft particije.\n"
@@ -1314,8 +1302,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1582,7 +1570,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1685,7 +1673,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1875,7 +1863,7 @@ msgstr "Grafi�ki interfejs"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1887,12 +1875,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Kliknite na \"%s\" ako želite obrisati sve podatke i particije koje\n"
 "su prisutne na ovom hard disku. Budite oprezni, jer nakon klikanja na\n"
diff --git a/perl-install/install/help/po/ca.po b/perl-install/install/help/po/ca.po
index 9b14dac0b..1ef47d3af 100644
--- a/perl-install/install/help/po/ca.po
+++ b/perl-install/install/help/po/ca.po
@@ -1,26 +1,28 @@
 # translation of ca.po to Catalan
 # translation of DrakX.po to Catalan
 # Copyright (C) 2000-2004, 2005 Free Software Foundation, Inc.
-# Softcatala, softcatala.org, 2000-2003
-# Albert Astals Cid <astals11@terra.es>, 2003-2004, 2005.
 #
 #
+# Softcatala, softcatala.org, 2000-2003.
+# Albert Astals Cid <astals11@terra.es>, 2003-2004, 2005.
+# Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-12 12:22+0200\n"
-"PO-Revision-Date: 2005-09-13 23:24+0200\n"
-"Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
-"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"PO-Revision-Date: 2013-12-21 13:36+0100\n"
+"Last-Translator: Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>\n"
+"Language-Team: Catalan <>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=n!=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"
@@ -29,10 +31,9 @@ msgid ""
 msgstr ""
 "Abans de continuar, llegiu atentament les clàusules de la llicència. "
 "Cobreix\n"
-"tota la distribució Mageia. Si esteu d'acord amb tots els termes de "
-"la\n"
-"llicència, feu clic al quadre \"%s\"; si no, prémer el botó \"%s\"\n"
-"reiniciarà el vostre ordinador."
+"tota la distribució Mageia. Si esteu d'acord amb tots els termes de la\n"
+"llicència, feu clic al quadre «%s»; si no, si premeu el botó \"%s\"\n"
+"es reiniciarà el vostre ordinador."
 
 #: ../help.pm:20
 #, c-format
@@ -130,12 +131,12 @@ msgstr ""
 #: ../help.pm:54
 #, c-format
 msgid "User name"
-msgstr ""
+msgstr "Nom d'usuari"
 
 #: ../help.pm:54
 #, c-format
 msgid "Accept user"
-msgstr ""
+msgstr "Accepta l'usuari"
 
 #: ../help.pm:54
 #, c-format
@@ -145,7 +146,8 @@ msgstr "Voleu utilitzar aquesta característica?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -155,24 +157,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Aquestes són les particions de Linux existents que s'han detectat al disc "
@@ -217,7 +223,7 @@ msgstr ""
 "una \"b\" significa \"segona ID SCSI més baixa\", etc."
 
 #: ../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"
@@ -228,10 +234,10 @@ msgstr ""
 "La instal·lació del Mageia està repartida en diversos CD-ROM. Si\n"
 "un dels paquets escollits està en un altre CD-ROM, DrakX expulsarà el CD\n"
 "actual i us demanarà que n'inseriu un altre. Si no teniu el CD necessari a\n"
-"mà, premeu \"%s\" i els paquets corresponents no s'instal·laran."
+"mà, premeu «%s» i els paquets corresponents no s'instal·laran."
 
 #: ../help.pm:95
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
 "There are thousands of packages available for Mageia, and to make it\n"
@@ -289,25 +295,25 @@ msgid ""
 "megabytes."
 msgstr ""
 "Ha arribat el moment d'indicar els programes que voleu instal·lar en el\n"
-"sistema. Mageia té milers de paquets, i per facilitar-ne la\n"
+"sistema. Mageia té milers de paquets, i per a facilitar-ne la\n"
 "gestió s'han distribuït en grups d'aplicacions similars.\n"
 "\n"
 "Mageia agrupa els paquets en quatre categories. Podeu mesclar i fer\n"
 "coincidir aplicacions de grups diversos, de manera que una instal·lació\n"
-"d'``Estació de treball'' pot perfectament tenir instal·lades aplicacions\n"
-"de la categoria ``Servidor'' \n"
+"d'«Estació de treball» pot perfectament tenir instal·lades aplicacions\n"
+"de la categoria «Servidor» \n"
+"\n"
 " * \"%s\": si voleu utilitzar l'ordinador com a estació de treball,\n"
 "seleccioneu un o més grups de la categoria estació de treball.\n"
 "\n"
-" * \"%s\": si penseu utilitzar la vostra màquina per programar, escolliu\n"
-"els grups adients d'aquesta categoria. El grup especial \"LSB\"\n"
+" * \"%s\": si penseu utilitzar la vostra màquina per a programar, escolliu\n"
+"els grups adients d'aquesta categoria. El grup especial «LSB»\n"
 "configurarà el vostre sistema per tal que compleixi tant com sigui\n"
-"possible amb les especificacions Linux Standard Base.\n"
+"possible les especificacions Linux Standard Base.\n"
 "\n"
-"   Seleccionar el grup \"LSB\" també instal·larà un kernel \"2.4\",\n"
-"en comptes del \"2.6\". Això es fa per assegurar que els sistema\n"
-"compleixi al 100%% amb LSB. Si no seleccioneu el grup \"LSB\"\n"
-"encara tindreu un sistema que compleix la LSB quasi al 100%%.\n"
+"   Si seleccioneu el grup «LSB» s'assegura que els sistema\n"
+"compleix al 100%% amb LSB. Si no seleccioneu el grup «LSB»\n"
+"encara tindreu un sistema que compleix la LSB gairebé al 100%%.\n"
 "\n"
 " * \"%s\":  si l'ordinador s'ha d'utilitzar com a servidor, seleccioneu\n"
 "quins dels serveis més habituals voleu instal·lar\n"
@@ -319,24 +325,26 @@ msgstr ""
 "Si moveu el cursor per sobre d'un nom de grup veureu una breu explicació\n"
 "d'aquest grup.\n"
 "\n"
-"Podeu marcar la casella \"%s\", que és útil si esteu familiaritzat amb els\n"
-"diversos paquets o si voleu tenir un control total sobre el que "
+"Podeu marcar la casella «%s», que és útil si esteu familiaritzats amb els\n"
+"diversos paquets o si voleu tenir un control total sobre allò que "
 "s'instal·larà.\n"
 "\n"
-"Si heu començat la instal·lació en el mode \"%s\", podeu desseleccionar \n"
+"Si comenceu la instal·lació en el mode «%s», podeu desseleccionar \n"
 "tots els grups si voleu evitar que s'instal·li cap paquet nou. Això és\n"
 "útil per reparar o actualitzar un sistema existent.\n"
+"\n"
 "Si desseleccioneu tots els grups quan estigueu fent una\n"
 "instal·lació normal (i no una actualització), se us presentarà un diàleg \n"
 "proposant-vos diferents opcions per a una instal·lació mínima:\n"
 "\n"
-" * \"%s\": instal·la els mínims paquets necessaris per tenir un\n"
+" * «%s»: instal·la els mínims paquets necessaris per a tenir un\n"
 "entorn gràfic funcional\n"
 "\n"
-" * \"%s\": instal·la el sistema base i les utilitats bàsiques amb la seva\n"
-"documentació. Aquesta instal·lació és adequada per configurar un servidor;\n"
+" * «%s»: instal·la el sistema base i les utilitats bàsiques amb la seva\n"
+"documentació. Aquesta instal·lació és adequada per a configurar un "
+"servidor;\n"
 "\n"
-" * \"%s\": instal·la el nombre mínim de paquets necessari per aconseguir un\n"
+" * «%s»: instal·la el nombre mínim de paquets necessari per a aconseguir un\n"
 "sistema Linux operatiu, només amb una interfície de línia d'ordres. Aquesta\n"
 "instal·lació ocupa uns 65 MB."
 
@@ -358,7 +366,7 @@ msgid "Truly minimal install"
 msgstr "Instal·lació mínima real"
 
 #: ../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"
@@ -405,17 +413,16 @@ msgstr ""
 "\n"
 "!! Si heu seleccionat un paquet de servidor, intencionadament o perquè\n"
 "formava part d'un grup, se us demanarà que confirmeu si realment voleu\n"
-"instal·lar aquests servidors. Per defecte, Mageia "
-"iniciaràautomàticament qualsevol servidor durant l'arrencada. Tot i que\n"
+"instal·lar aquests servidors. Per defecte, Mageia iniciarà \n"
+"automàticament qualsevol servidor durant l'arrencada. Tot i que\n"
 "siguin segurs i no tinguin cap problema conegut quan es publica la\n"
 "distribució, és totalment possible que es descobreixin forats de seguretat\n"
 "després que aquesta versió de Mageia quedi finalitzada.\n"
 "Si no sabeu què se suposa que fa un servei en particular, o per què s'està\n"
-"instal·lant, feu clic a \"%s\". Per defecte, si feu clic a \"%s\" els "
-"serveis\n"
+"instal·lant, feu clic a «%s». Per defecte, si feu clic a «%s» els serveis\n"
 "llistats s'instal·laran i s'iniciaran automàticament durant l'arrencada. !!\n"
 "\n"
-"L'opció \"%s\" s'utilitza per inhabilitar el diàleg d'advertència que\n"
+"L'opció «%s» s'utilitza per inhabilitar el diàleg d'advertència que\n"
 "apareix quan l'instal·lador selecciona automàticament un paquet per "
 "resoldre\n"
 "dependències. Alguns paquets estan relacionats els uns amb els\n"
@@ -432,7 +439,7 @@ msgstr ""
 "anteriorment\n"
 "al final d'una altra instal·lació. Vegeu el segon suggeriment de l'últim "
 "pas\n"
-"per saber com crear aquest disquet."
+"per a saber com crear aquest disquet."
 
 #: ../help.pm:183
 #, c-format
@@ -514,7 +521,7 @@ msgstr ""
 #: ../help.pm:213
 #, c-format
 msgid "Hardware clock set to GMT"
-msgstr ""
+msgstr "Rellotge de maquinari establert a GMT"
 
 #: ../help.pm:213
 #, c-format
@@ -545,7 +552,7 @@ msgstr ""
 "més convenient."
 
 #: ../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"
@@ -605,7 +612,7 @@ msgid ""
 msgstr ""
 "X (per sistema X Window) és el cor de la interfície gràfica de GNU/Linux\n"
 "de què depenen tots els entorns gràfics (KDE, GNOME, AfterStep, \n"
-"WindowMaker, etc.) que venen amb Mageia.\n"
+"WindowMaker, etc.) que vénen amb Mageia.\n"
 "\n"
 "Veureu una relació de diferents paràmetres que podeu canviar per aconseguir\n"
 "una visualització gràfica òptima.\n"
@@ -617,7 +624,7 @@ msgstr ""
 "de la llista la targeta que realment tingueu instal·lada.\n"
 "\n"
 "   En cas que hi hagi diferents servidors disponibles per a la vostra\n"
-"targeta, amb o sense acceleració 3D, se us demanarà que escolliu el que\n"
+"targeta, amb acceleració 3D o sense, se us demanarà que escolliu el que\n"
 "més us convingui.\n"
 "\n"
 "\n"
@@ -644,7 +651,7 @@ msgstr ""
 "   Depenent del maquinari aquesta entrada pot no aparèixer.\n"
 "\n"
 "   El sistema intentarà obrir una pantalla gràfica amb la resolució\n"
-"desitjada. Si podeu veure el missatge durant la prova i responeu \"%s\",\n"
+"desitjada. Si podeu veure el missatge durant la prova i responeu «%s»,\n"
 "DrakX passarà al pas següent. Si no el podeu veure, vol dir que la\n"
 "configuració detectada automàticament no era del tot correcta i la prova\n"
 "finalitzarà automàticament al cap de 12 segons, portant-vos de nou al menú.\n"
@@ -655,7 +662,7 @@ msgstr ""
 "Opcions\n"
 "\n"
 "   Aquí podeu decidir si voleu que l'ordinador canviï automàticament a una\n"
-"interfície gràfica en arrencar. Òbviament, voldreu activar \"%s\" si\n"
+"interfície gràfica en arrencar. Òbviament, voldreu activar «%s» si\n"
 "l'ordinador ha d'actuar com a servidor, o si no heu aconseguit\n"
 "configurar la pantalla."
 
@@ -719,34 +726,38 @@ msgstr ""
 "ha de ser un servidor, o si no heu pogut configurar la pantalla."
 
 #: ../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 drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -762,14 +773,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -799,23 +811,23 @@ msgstr ""
 "Segons la configuració del vostre disc dur, hi ha diverses opcions\n"
 "possibles:\n"
 "\n"
-" * \"%s\": aquesta opció particionarà automàticament les unitats buides.\n"
+" * «%s»: aquesta opció particionarà automàticament les unitats buides.\n"
 "Amb aquesta opció no se us farà cap pregunta més.\n"
 "\n"
-" * \"%s\": l'auxiliar ha detectat una o més particions de Linux al vostre\n"
+" * «%s»: l'auxiliar ha detectat una o més particions de Linux al vostre\n"
 "disc dur. Si voleu utilitzar-les, escolliu aquesta opció. Se us demanarà\n"
 "que trieu els punts de muntatge associats a cadascuna de les particions.\n"
 "Els punts de muntatge existents se seleccionen per defecte, i en la\n"
 "majoria dels casos és bona idea conservar-los.\n"
 "\n"
-" * \"%s\" Si teniu el Microsoft Windows instal·lat al disc dur i n'ocupa\n"
+" * «%s». Si teniu el Microsoft Windows instal·lat al disc dur i n'ocupa\n"
 "tot l'espai disponible, caldrà crear espai lliure per a GNU/Linux. Per\n"
 "fer-ho, podeu suprimir la partició i les dades del Windows\n"
-"(consulteu la solució ``Esborrar completament el disc'') o canviar\n"
+"(consulteu la solució «Esborrar completament el disc») o canviar\n"
 "la mida de la partició FAT o NTFS de Windows. Aquest canvi de mida\n"
 "es pot dur a terme sense cap pèrdua de dades, sempre que la\n"
 "partició de Windows hagi estat desfragmentada prèviament.\n"
-"És molt recomanable, fer una còpia de seguretat de les dades.\n"
+"És molt recomanable fer una còpia de seguretat de les dades.\n"
 "Aquesta opció és la més recomanable si voleu utilitzar tant\n"
 "Mageia com Microsoft Windows al mateix ordinador.\n"
 "\n"
@@ -824,26 +836,26 @@ msgstr ""
 "lliure a Microsoft Windows per emmagatzemar-hi dades o instal·lar-hi més "
 "programari.\n"
 "\n"
-" *\"%s\": si voleu suprimir totes les dades i particions que teniu al disc\n"
+" *«%s»: si voleu suprimir totes les dades i particions que teniu al disc\n"
 "dur i substituir-les pel sistema Mageia, podeu escollir aquesta\n"
 "opció. Aneu amb compte, però, perquè, un cop la confirmeu, no podreu\n"
 "fer-vos enrere.\n"
 "\n"
-"   ¡¡ Si trieu aquesta opció, totes les dades del disc s'esborraran !!.\n"
+"   ¡¡ Si trieu aquesta opció, totes les dades del disc s'esborraran. !!\n"
 "\n"
-" *\"%s\": aquesta opció apareix quan el disc dur està completament ple\n"
+" *«%s». Aquesta opció apareix quan el disc dur està completament ple\n"
 "per Microsoft Windows. Escollir aquest opció esborrarà tot el contingut del "
 "disc i\n"
 "començarà de nou, particionant des de zero.\n"
 "   ¡¡ Si trieu aquesta opció, totes les dades del disc s'esborraran !!.\n"
 "\n"
-" * \"%s\": si voleu particionar el disc dur manualment, podeu triar aquesta\n"
+" * «%s»: si voleu particionar el disc dur manualment, podeu triar aquesta\n"
 "opció. Aneu amb compte: és una opció molt potent però també perillosa, ja\n"
 "que podeu perdre fàcilment totes les dades. Per tant, aquesta opció només "
 "és\n"
 "recomanable si heu fet abans alguna cosa similar i teniu una mica\n"
 "d'experiència. Trobareu més instruccions sobre la utilitat DiskDrake a la\n"
-"secció ``Gestió de les particions'' de la ``Guia d'iniciació''."
+"secció «Gestió de les particions» de la «Guia d'iniciació»."
 
 #: ../help.pm:377
 #, c-format
@@ -853,7 +865,7 @@ msgstr "Utilitza les particions existents"
 #: ../help.pm:370
 #, c-format
 msgid "Use the free space on the Microsoft Windows® partition"
-msgstr ""
+msgstr "Utilitza l'espai lliure en la partició Microsoft Windows®"
 
 #: ../help.pm:370
 #, c-format
@@ -940,20 +952,20 @@ msgstr "Genera un disquet per a la instal·lació automàtica"
 #: ../help.pm:405
 #, c-format
 msgid "Replay"
-msgstr ""
+msgstr "Repeteix"
 
 #: ../help.pm:405
 #, c-format
 msgid "Automated"
-msgstr ""
+msgstr "Automatitzat"
 
 #: ../help.pm:405
 #, c-format
 msgid "Save packages selection"
-msgstr ""
+msgstr "Desa la selecció de paquets"
 
 #: ../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"
@@ -977,12 +989,9 @@ msgid ""
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
-"Per poder utilitzar les particions que s'acaben de definir cal formatar-les\n"
-"(la formatació consisteix a crear-hi un sistema de fitxers).\n"
-"\n"
-"En aquest punt, potser voldreu tornar a formatar algunes de les particions\n"
-"existents per eliminar les dades que contenen. Si és així, seleccioneu\n"
-"també aquestes particions.\n"
+"Si heu triat la reutilització d'algunes de les particions de GNU/Linux,\n"
+"potser voleu reformatar-ne algunes i esborrar les dades que contenen.\n"
+"Per a fer-ho, seleccioneu també aquestes particions.\n"
 "\n"
 "Tingueu en compte que no cal tornar a formatar totes les particions que ja\n"
 "existien; heu de tornar a formatar les particions que continguin el sistema\n"
@@ -992,16 +1001,16 @@ msgstr ""
 "Aneu amb compte en seleccionar les particions; després de la formatació,\n"
 "totes les dades s'hauran suprimit i no en podreu recuperar cap.\n"
 "\n"
-"Feu clic a \"%s\" quan estigueu a punt per formatar les particions.\n"
+"Feu clic a «%s» quan estigueu a punt per formatar les particions.\n"
 "\n"
-"Feu clic a \"%s\" si voleu seleccionar una altra partició per instal·lar\n"
+"Feu clic a «%s» si voleu seleccionar una altra partició per instal·lar\n"
 "el nou sistema Mageia.\n"
 "\n"
-"Feu clic a \"%s\" si voleu seleccionar particions on cercar-hi blocs "
+"Feu clic a «%s» si voleu seleccionar particions on cercar-hi blocs "
 "defectuosos."
 
 #: ../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"
@@ -1015,20 +1024,20 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Ara esteu instal·lant Mageia, és probable que alguns paquets\n"
+"En el moment d'instal·lar Mageia, és probable que alguns paquets\n"
 "hagin estat actualitzats des de la data de llançament. Alguns errors poden\n"
 "haver estat resolts, i problemes de seguretat poden estar ja corregits.\n"
 "Per beneficiar-vos d'aquestes actualitzacions, les podeu baixar d'Internet.\n"
-"Trieu \"%s\" si teniu una connexió a Internet operativa, o \"%s\" si\n"
+"Trieu «%s» si teniu una connexió a Internet operativa, o bé «%s» si\n"
 "preferiu instal·lar-les més tard.\n"
 "\n"
-"Si trieu \"%s\" apareixerà una llista de llocs des d'on podeu baixar les\n"
+"Si trieu «%s» apareixerà una llista de llocs des d'on podeu baixar les\n"
 "actualitzacions. Escolliu la ubicació més propera. Aleshores, apareixerà\n"
-"un arbre de selecció de paquets: comproveu la selecció i premeu \"%s\" per\n"
-"baixar i instal·lar els paquets seleccionats, o \"%s\" per abandonar."
+"un arbre de selecció de paquets: comproveu la selecció i premeu «%s» per\n"
+"baixar i instal·lar els paquets seleccionats, o bé «%s» per abandonar."
 
 #: ../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"
@@ -1053,7 +1062,7 @@ msgstr ""
 "el nivell de seguretat més tard amb l'eina draksec del\n"
 "Centre de Control Mageia.\n"
 "\n"
-"Ompliu el camp \"%s\" amb l'adreça electrònica de la persona responsable\n"
+"Ompliu el camp «%s» amb l'adreça electrònica de la persona responsable\n"
 "de la seguretat. Els missatges de seguretat s'enviaran a aquesta adreça."
 
 #: ../help.pm:461
@@ -1062,24 +1071,27 @@ msgid "Security Administrator"
 msgstr "Administrador de seguretat"
 
 #: ../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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1095,21 +1107,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1126,14 +1140,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Ara és quan heu de decidir quina(es) partició(ns) voleu utilitzar per\n"
 "instal·lar el sistema Mageia. Si ja s'han definit les particions\n"
@@ -1142,49 +1150,48 @@ msgstr ""
 "s'han de definir particions al disc dur.\n"
 "\n"
 "Per crear particions, primer heu de seleccionar un disc dur. Podeu\n"
-"seleccionar el disc que s'ha de particionar fent clic a ``hda'' per a la\n"
-"primera unitat IDE, ``hdb'' per a la segona, ``sda'' per a la primera "
-"unitat\n"
+"seleccionar el disc que s'ha de particionar fent clic a «hda» per a la\n"
+"primera unitat IDE, «hdb» per a la segona, «sda» per a la primera unitat\n"
 "SCSI, etc.\n"
 "\n"
 "Per particionar el disc dur seleccionat, podeu utilitzar aquestes opcions:\n"
 "\n"
-" * \"%s\": aquesta opció suprimeix totes les particions que hi ha al\n"
+" * «%s»: aquesta opció suprimeix totes les particions que hi ha al\n"
 "disc dur seleccionat.\n"
 "\n"
-" * \"%s\": aquesta opció us permet crear automàticament les particions\n"
-"ext3 i d'intercanvi en l'espai lliure del disc dur.\n"
+" * «%s»: aquesta opció us permet crear automàticament les particions\n"
+"ext4 i d'intercanvi en l'espai lliure del disc dur.\n"
 "\n"
-"\"%s\": dóna accés a funcions addicionals:\n"
+"«%s»: dóna accés a funcions addicionals:\n"
 "\n"
-" * \"%s\": desa la taula de particions en un disquet. És útil per a una\n"
+" * «%s»: desa la taula de particions en un disquet. És útil per a una\n"
 "recuperació posterior de la taula de particions si fos necessari. És molt\n"
 "recomanable que efectueu aquesta operació.\n"
 "\n"
-" * \"%s\": permet restaurar d'un disquet una taula de particions que hi\n"
+" * «%s»: permet restaurar d'un disquet una taula de particions que hi\n"
 "hagueu desat prèviament.\n"
 "\n"
-" * \"%s\": si la taula de particions està malmesa, podeu provar de\n"
+" * «%s»: si la taula de particions està malmesa, podeu provar de\n"
 "recuperar-la utilitzant aquesta opció. Aneu amb compte i recordeu que no\n"
 "sempre funciona.\n"
 "\n"
-" * \"%s\": descarta tots els canvis fets i torna a carregar la taula\n"
+" * «%s»: descarta tots els canvis fets i torna a carregar la taula\n"
 "de particions original.\n"
 "\n"
-" * \"%s\": si desseleccioneu aquesta opció fareu que els usuaris hagin\n"
+" * «%s»: si desseleccioneu aquesta opció fareu que els usuaris hagin\n"
 "de muntar i desmuntar manualment les unitats de suports extraïbles, com ara\n"
 "els disquets i els CD-ROM.\n"
 "\n"
-" * \"%s\": utilitzeu aquesta opció si voleu utilitzar un auxiliar per\n"
+" * «%s»: utilitzeu aquesta opció si voleu utilitzar un auxiliar per\n"
 "particionar el vostre disc dur. Es recomana que l'utilitzeu si no teniu\n"
 "sòlids coneixements sobre particionament.\n"
 "\n"
-" * \"%s\": utilitzeu aquesta opció per cancel·lar els canvis.\n"
+" * «%s»: utilitzeu aquesta opció per cancel·lar els canvis.\n"
 "\n"
-" * \"%s\": permet accions addicionals en les particions (tipus,\n"
+" * «%s»: permet accions addicionals en les particions (tipus,\n"
 "opcions, format) i dóna més informació sobre el disc dur.\n"
 "\n"
-" * \"%s\": quan hagueu acabat de particionar el disc dur, aquesta opció\n"
+" * «%s»: quan hagueu acabat de particionar el disc dur, aquesta opció\n"
 "desarà els canvis al disc.\n"
 "\n"
 "En definir la mida d'una partició, podeu acabar d'afinar-la mitjançant\n"
@@ -1202,29 +1209,23 @@ msgstr ""
 "\n"
 " * Ctrl+m per definir el punt de muntatge\n"
 "\n"
-"Per a més informació sobre els diferents sistemes de fitxers disponibles,\n"
-"llegiu el capítol sobre ext2FS del ``Manual de Referència''.\n"
-"\n"
-"Si esteu fent la instal·lació en un ordinador PPC, voldreu crear una\n"
-"petita partició ``bootstrap'' HFS d'un mínim d'1 MB per a ús del carregador\n"
-"d'arrencada yaboot. Si decidiu fer-la una mica més gran, per exemple de\n"
-"50 MB, us serà d'utilitat per emmagatzemar un nucli de recanvi i imatges\n"
-"del disc RAM per a situacions d'emergència durant l'arrencada."
+"Per a més informació sobre els diversos sistemes de fitxers disponibles,\n"
+"llegiu el capítol sobre ext2FS del «Manual de Referència».\n"
 
 #: ../help.pm:526
 #, c-format
 msgid "Save partition table"
-msgstr ""
+msgstr "Desa la taula de particions"
 
 #: ../help.pm:526
 #, c-format
 msgid "Restore partition table"
-msgstr ""
+msgstr "Recupera la taula de particions"
 
 #: ../help.pm:526
 #, c-format
 msgid "Rescue partition table"
-msgstr ""
+msgstr "Rescata la taula de particions"
 
 #
 #: ../help.pm:526
@@ -1235,12 +1236,12 @@ msgstr "Muntatge automàtic dels dispositius extraïbles"
 #: ../help.pm:526
 #, c-format
 msgid "Wizard"
-msgstr ""
+msgstr "Auxiliar"
 
 #: ../help.pm:526
 #, c-format
 msgid "Undo"
-msgstr ""
+msgstr "Desfés"
 
 #: ../help.pm:526
 #, c-format
@@ -1248,71 +1249,74 @@ msgid "Toggle between normal/expert mode"
 msgstr "Commuta entre els modes normal i expert"
 
 #: ../help.pm:536
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "S'ha detectat més d'una partició de Microsoft a la unitat de disc.\n"
 "Si us plau, trieu quina d'elles voleu redimensionar per instal·lar el nou\n"
 "sistema operatiu Mageia.\n"
 "\n"
-"Cada partició està identificada d'aquesta manera: \"Nom Linux\",\n"
-"\"Nom Windows\" \"Capacitat\".\n"
+"Cada partició està identificada d'aquesta manera: «Nom Linux»,\n"
+"«Nom Windows» «Capacitat».\n"
 "\n"
-"\"Nom Linux\" es compon de: \"tipus d'unitat de disc dur\",\n"
-"\"número d'unitat de disc dur\", \"número de la partició\"\n"
-"(per exemple, \"hda1\").\n"
+"«Nom Linux» es compon de: «tipus d'unitat de disc dur»,\n"
+"«número d'unitat de disc dur», «número de la partició»\n"
+"(per exemple, «hda1»).\n"
 "\n"
-"\"Tipus d'unitat de disc dur\" és \"hd\" si la vostre unitat de disc dur és\n"
-"IDE i \"sd\" si és SCSI.\n"
+"«Tipus d'unitat de disc dur» és «hd» si la vostra unitat de disc dur és\n"
+"IDE i «sd» si és SCSI.\n"
 "\n"
-"\"Número de la unitat de disc dur\" és sempre una lletra després d'\"hd\" o\n"
-"\"sd\". Amb unitats de disc IDE:\n"
+"«Número de la unitat de disc dur» és sempre una lletra després d'«hd» o\n"
+"bé «sd». Amb unitats de disc IDE:\n"
 "\n"
-" * \"a\" significa \"unitat de disc mestra en el controlador IDE primari\",\n"
+" * «a» significa «unitat de disc mestra en el controlador IDE primari»,\n"
 "\n"
-" * \"b\" significa \"unitat de disc esclava en el controlador IDE primari"
-"\",\n"
+" * «b» significa «unitat de disc esclava en el controlador IDE primari»,\n"
 "\n"
-" * \"c\" significa \"unitat de disc mestra en el controlador IDE secundari"
-"\",\n"
+" * «c» significa «unitat de disc mestra en el controlador IDE secundari»,\n"
 "\n"
-" * \"d\" significa \"unitat de disc esclava en el controlador IDE secundari"
-"\".\n"
+" * «d» significa «unitat de disc esclava en el controlador IDE secundari».\n"
 "\n"
-"Amb les unitats de disc SCSI, una \"a\" significa \"ID SCSI més baixa\",\n"
-"una \"b\" significa \"segona ID SCSI més baixa\", etc.\n"
+"Amb les unitats de disc SCSI, una «a» significa «ID SCSI més baixa»,\n"
+"una «b» significa «segona ID SCSI més baixa», etc.\n"
 "\n"
-"\"Nom Windows\" és la lletra de la vostra unitat de disc sota Windows (el\n"
-"primer disc o partició s'anomena \"C:\")."
+"«Nom Windows» és la lletra de la vostra unitat de disc sota Windows (el\n"
+"primer disc o partició s'anomena «C:»)."
 
 #: ../help.pm:567
 #, c-format
@@ -1328,7 +1332,7 @@ msgstr ""
 "obtenir una llista de països completa."
 
 #: ../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"
@@ -1339,8 +1343,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1351,30 +1356,30 @@ msgid ""
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mageia version \"8.1\" is not recommended."
 msgstr ""
-"Aquest pas només s'activa si s'ha trobat una partició GNU/Linux antiga\n"
+"Aquest pas només s'activa si s'ha trobat una partició GNU/Linux existent\n"
 "al vostre ordinador.\n"
 "\n"
-"DrakX necessita saber si voleu realitzar una instal·lació nova o\n"
+"DrakX necessita saber si voleu realitzar una instal·lació nova o bé\n"
 "una actualització d'un sistema Mageia existent:\n"
 "\n"
-" * \"%s\": aquesta opció destrueix gairebé del tot el sistema antic. Si\n"
+" * «%s». Aquesta opció destrueix gairebé del tot el sistema existent. Si\n"
 "voleu canviar les particions dels discs durs, o el sistema de fitxers,\n"
 "heu d'utilitzar aquesta opció. No obstant això, i depenent de l'esquema de\n"
 "particionament que tingueu, podeu evitar que part de les dades existents\n"
-"(per exemple els directoris \"home\") se sobreescriguin.\n"
+"(per exemple els directoris «home») se sobreescriguin.\n"
 "\n"
-" * \"%s\": aquest tipus d'instal·lació us permet actualitzar els paquets\n"
+" * «%s». Aquest tipus d'instal·lació us permet actualitzar els paquets\n"
 "que ja estan instal·lats al sistema Mageia. L'esquema de\n"
 "particionament actual i les dades d'usuari no queden afectades. La\n"
 "majoria de les altres fases de configuració queden disponibles, de\n"
 "manera similar a una instal·lació estàndard.\n"
 "\n"
-"L'opció “Actualitza� ha de funcionar correctament en sistemes Mandriva\n"
-"Linux amb la versió \"8.1\" o posteriors. No es recomana realitzar una\n"
-"actualització en versions de Mageia anteriors a la \"8.1\"."
+"L'opció «Actualitza» hauria de funcionar correctament en sistemes Mandriva\n"
+"Linux amb la versió «8.1» o posteriors. No es recomana realitzar una\n"
+"actualització en versions de Mandriva anteriors a la «8.1»."
 
 #: ../help.pm:594
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Depending on the language you chose (), DrakX will automatically select a\n"
 "particular type of keyboard configuration. Check that the selection suits\n"
@@ -1394,7 +1399,7 @@ msgid ""
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
 "DrakX seleccionarà automàticament la configuració de teclat correcta\n"
-"segons l'idioma que hagueu escollit a Secció. Comproveu que la selecció\n"
+"segons l'idioma que hagueu escollit. Comproveu que la selecció\n"
 "us vagi bé o escolliu una altra configuració de teclat.\n"
 "\n"
 "Tanmateix, pot ser que tingueu un teclat que no correspongués exactament al\n"
@@ -1406,15 +1411,14 @@ msgstr ""
 "tots dos casos, aquesta fase de la instal·lació us permetrà triar un teclat\n"
 "adequat d'una llista.\n"
 "\n"
-"Feu clic al botó \"%s\" per veure la llista completa de teclats "
-"disponibles.\n"
+"Feu clic al botó «%s» per veure la llista completa de teclats disponibles.\n"
 "\n"
 "Si trieu una disposició de teclat basada en un alfabet no llatí, el diàleg\n"
 "següent us permetrà escollir la tecla que servirà per canviar entre les\n"
 "configuracions llatina i no llatina."
 
 #: ../help.pm:612
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1456,22 +1460,24 @@ msgid ""
 "by the entire system. Running the command as a regular user will only\n"
 "change the language settings for that particular user."
 msgstr ""
+"El primer pas consisteix a triar l'idioma preferit.\n"
+"\n"
 "L'idioma preferit que trieu afectarà a l'idioma de la documentació,\n"
 "l'instal·lador i a tot el sistema en general. Seleccioneu primer la\n"
 "regió on us trobeu i després l'idioma que parleu.\n"
 "\n"
-"Si feu clic al botó \"%s\" podreu seleccionar altres idiomes que vulgueu\n"
+"Si feu clic al botó «%s» podreu seleccionar altres idiomes que vulgueu\n"
 "instal·lar a la vostra estació de treball. S'instal·laran els fitxers\n"
 "d'idioma específics de la documentació i de les aplicacions. Per exemple,\n"
 "si heu de tenir usuaris espanyols a l'ordinador, podeu triar l'anglès com a\n"
-"idioma per defecte a la vista d'arbre i marcar \"%s\" a la secció Avançat.\n"
+"idioma per defecte a la vista d'arbre i «%s» a la secció Avançat.\n"
 "\n"
-"En quant al suport UTF-8 (unicode): Unicode és una nova codificació de\n"
+"Quant al suport UTF-8 (unicode): Unicode és una nova codificació de\n"
 "caràcters que cobreix tots els idiomes existents. El suport complet a\n"
-"GNU/Linux encara està sota desenvolupament. Per aquesta raó, Mageia\n"
+"GNU/Linux encara està en desenvolupament. Per aquesta raó, Mageia\n"
 "l'usarà o no depenent de les opcions que esculli l'usuari:\n"
 "\n"
-" * Si escolliu un idioma amb una codificació existent forta(idiomes\n"
+" * Si escolliu un idioma amb una codificació existent forta (idiomes\n"
 "llatins, rus, japonès, xinès, coreà, thai, grec, turc, la majoria dels\n"
 "idiomes iso-8859-2), la codificació existent s'usarà per defecte;\n"
 "\n"
@@ -1480,19 +1486,18 @@ msgstr ""
 " * Si s'instal·len dos o més idiomes i aquests idiomes no usen la mateixa\n"
 "codificació, llavors s'usarà unicode per tot el sistema;\n"
 "\n"
-" * Finalment, es pot forçar l'ús de unicode si s'escull la opció\"%s\"\n"
+" * Finalment, es pot forçar l'ús de unicode si s'escull la opció «%s»\n"
 "independentment dels idiomes escollits.\n"
 "\n"
 "Noteu que no esteu limitats a escollir només un idioma addicional. Podeu\n"
 "triar diversos idiomes addicionals, i fins i tot instal·lar-los tots\n"
-"activant la casella \"%s\". Si habiliteu un idioma esteu instal·lant les\n"
+"activant la casella «%s». Si habiliteu un idioma esteu instal·lant les\n"
 "traduccions, els tipus de lletra, els verificadors ortogràfics, etc. "
 "d'aquest idioma.\n"
 "\n"
-"Per passar d'un dels idiomes a un altre, podeu executar com a \"root\"\n"
-"l'ordre \"/usr/sbin/localedrake\" per canviar l'idioma de tot el sistema. "
-"Si\n"
-"l'executeu com a usuari normal, només es canviarà l'idioma d'aquest\n"
+"Per passar d'un dels idiomes a un altre, podeu executar com a «root»\n"
+"l'ordre «/usr/sbin/localedrake» per canviar l'idioma de tot el sistema.\n"
+"Si l'executeu com a usuari normal, només es canviarà l'idioma d'aquest\n"
 "usuari concret."
 
 #: ../help.pm:650
@@ -1503,10 +1508,10 @@ msgstr "Espanyol"
 #: ../help.pm:643
 #, c-format
 msgid "Use Unicode by default"
-msgstr ""
+msgstr "Utilitza unicode per defecte"
 
 #: ../help.pm:646
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
@@ -1543,29 +1548,31 @@ msgid ""
 msgstr ""
 "DrakX generalment detecta el nombre de botons que té el vostre ratolí.\n"
 "Si no pot, assumeix que teniu un ratolí de dos botons i el configurarà per\n"
-"emular el tercer botó. Es pot ``prémer' ' el tercer botó d'un ratolí de dos\n"
+"emular el tercer botó. Es pot «prémer» el tercer botó d'un ratolí de dos\n"
 "botons fent clic simultàniament als botons dret i esquerre. DrakX\n"
 "detectarà automàticament si el ratolí utilitza la interfície PS/2, sèrie o "
 "USB.\n"
 "\n"
 "En cas que tingueu un ratolí de 3 botons sense rodeta, podeu escollir\n"
-"\"%s\". DrakX configurarà el ratolí per tal de simular la rodeta,\n"
+"«%s». DrakX configurarà el ratolí per tal de simular la rodeta,\n"
 "per fer-ho premeu el botó central i moveu el ratolí a dalt i a baix.\n"
 "\n"
 "Si per alguna raó voleu especificar un altre tipus de ratolí,\n"
 "seleccioneu-lo a la llista.\n"
 "\n"
+"Podeu seleccionar l'entrada «%s» per a escollir un ratolí de tipus\n"
+"«genèric», que funcionarà amb gairebé qualsevol ratolí.\n"
+"\n"
 "Si escolliu un ratolí diferent del ratolí per defecte, es mostrarà una\n"
 "pantalla de prova. Utilitzeu els botons i la roda per verificar que la\n"
 "configuració és correcta i que el ratolí funciona bé. Si el ratolí no\n"
 "funciona bé, premeu la barra d'espai o la tecla [Intro] per cancel·lar la\n"
 "prova i tornar a la llista.\n"
 "\n"
-"De vegaDES, la roda del ratolí no es detecta automàticament. En aquest cas,\n"
+"De vegades, la roda del ratolí no es detecta automàticament. En aquest cas,\n"
 "haureu de seleccionar-lo a la llista. Assegureu-vos de triar el que\n"
 "correspon al port a què esta connectat el ratolí. Després de seleccionar un\n"
-"ratolí i prémer el botó \"%s\", a la pantalla apareixerà un ratolí. Mogueu "
-"la\n"
+"ratolí i prémer el botó «%s», a la pantalla apareixerà un ratolí. Mogueu la\n"
 "roda del ratolí per assegurar-vos que s'ha activat correctament, comprovant\n"
 "que es mou també a la pantalla; després comproveu els botons i que el "
 "cursor\n"
@@ -1591,7 +1598,7 @@ msgstr ""
 "Windows s'anomena \"ttyS0\" a GNU/Linux."
 
 #: ../help.pm:684
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A boot loader is a little program which is started by the computer at boot\n"
 "time. It's responsible for starting up the whole system. Normally, the boot\n"
@@ -1604,30 +1611,32 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
 "know what you're doing."
 msgstr ""
-"LILO i GRUB són carregadors d'arrencada de GNU/Linux. Normalment,\n"
-"aquesta fase es realitza de manera totalment automàtica. DrakX analitzarà\n"
-"el sector d'arrencada del disc i actuarà conforme al que hi trobi:\n"
+"Un carregador d'arrencada és un petit programa que l'ordinador executa\n"
+"durant l'arrencada. És l'encarregat d'iniciar tot el sistema. Normalment, \n"
+"la instal·lació del carregador d'arrencada es realitza de manera \n"
+"totalment automàtica. DrakX analitzarà el sector d'arrencada del disc \n"
+"i actuarà conforme al que hi trobi:\n"
 "\n"
 " * si troba un sector d'arrencada del Windows, el reemplaçarà amb un sector\n"
 "d'arrencada de GRUB/LILO. D'aquesta manera podreu carregar GNU/Linux\n"
-"o un altre SO.\n"
+"o bé un altre SO.\n"
 "\n"
-" * si troba un sector d'arrencada grub o LILO, el reemplaçarà amb un nou.\n"
+" * si troba un sector d'arrencada GRUB o LILO, el reemplaçarà amb un de "
+"nou.\n"
 "\n"
-"Si no pot prendre una decisió,  DrakX us preguntarà on ha de col·locar el\n"
-"carregador d'arrencada. Normalment, \"%s\" és el lloc més segur. Si "
-"escolliu\n"
-"\"%s\" no s'instal·larà cap carregador d'arrencada. Utilitzeu-lo només si\n"
-"sabeu que esteu fent."
+"Si no pot prendre una decisió, DrakX us preguntarà on ha de col·locar el\n"
+"carregador d'arrencada. Normalment, «%s» és el lloc més segur. Si escolliu\n"
+"«%s» no s'instal·larà cap carregador d'arrencada. Utilitzeu-lo només si\n"
+"sabeu què esteu fent."
 
 #: ../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"
@@ -1655,34 +1664,33 @@ msgid ""
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Ara cal seleccionar el sistema d'impressió del vostre ordinador. Altres\n"
-"sistemes operatius us poden oferir un, però el Mageia n'ofereix\n"
+"sistemes operatius us en poden oferir un, però el Mageia n'ofereix\n"
 "dos. Cada sistema d'impressió és el més convenient per a un tipus de\n"
 "configuració determinat.\n"
 "\n"
-" * \"%s\", acrònim de \"print, do not queue\" (imprimeix, no facis cua), és\n"
+" * «%s», acrònim de «print, do not queue» (imprimeix, no facis cua), és\n"
 "la millor opció si teniu una connexió directa amb la impressora i voleu\n"
 "evitar els embussos a l'hora d'imprimir, i no teniu impressores de xarxa.\n"
-"(\"%s\" només gestionarà xarxes molt senzilles i és una mica lenta quan\n"
-"s'usa en xarxa.) Escolliu \"pdq\" si és la vostra primera incursió\n"
-"en GNU/Linux.\n"
+"(«%s» només gestionarà xarxes molt senzilles i és una mica lenta quan\n"
+"s'usa en xarxa.) Escolliu «pdq» si és la vostra primera incursió\n"
+"a GNU/Linux.\n"
 "\n"
-" * \"%s\" `` Common Unix Printing System'', Sistema d'impressió comú de\n"
-"Unix, és una elecció excel·lent tant si voleu imprimir a la vostra\n"
+" * «%s» «Common Unix Printing System» (sistema d'impressió comú de\n"
+"Unix), és una elecció excel·lent tant si voleu imprimir a la vostra\n"
 "impressora local com a l'altra punta del món. És senzilla de configurar i\n"
-"pot actuar com a servidor o client per a l'antic sistema d'impressió \"lpd"
-"\"\n"
+"pot actuar com a servidor o client per a l'antic sistema d'impressió «lpd»\n"
 "i, per tant, és compatible amb sistemes operatius antics que encara\n"
 "necessitin serveis d'impressió. És força potent, però la configuració "
 "bàsica\n"
-"és gairebé tan senzilla com la de \"pdq\". Si necessiteu emular un servidor\n"
-"\"lpd\", heu d'habilitar el dimoni \"cups-lpd\". \"%s\" inclou frontals\n"
+"és gairebé tan senzilla com la de «pdq». Si necessiteu emular un servidor\n"
+"«lpd», heu d'habilitar el dimoni «cups-lpd». «%s» inclou frontals\n"
 "gràfics per a la impressió o per escollir les opcions d'impressió\n"
 "i per gestionar la impressora.\n"
 "\n"
 "Si ara feu una tria, i després veieu que el sistema d'impressió no us\n"
 "agrada, podeu canviar-lo executant el PrinterDrake des del Centre de "
-"control\n"
-"de Mageia i fent clic al botó Expert."
+"Control\n"
+"de Mageia i fent clic al botó «%s»."
 
 #: ../help.pm:768
 #, c-format
@@ -1692,7 +1700,7 @@ msgstr "pdq"
 #: ../help.pm:724
 #, c-format
 msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
 
 #: ../help.pm:724
 #, c-format
@@ -1707,7 +1715,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1742,18 +1750,18 @@ msgstr ""
 "manualment."
 
 #: ../help.pm:789
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\"%s\": if a sound card is detected on your system, it'll be displayed\n"
 "here. If you notice the sound card is not the one actually present on your\n"
 "system, you can click on the button and choose a different driver."
 msgstr ""
-"\"%s\": si es detecta una targeta de so al vostre sistema, es mostra aquí.\n"
+"«%s»: si es detecta una targeta de so al vostre sistema, es mostra aquí.\n"
 "Si veieu que la targeta de so que es mostra no és la que realment teniu al\n"
-"sistema, podeu fer clic al botó i seleccionar un altre programa de control."
+"sistema, podeu fer clic al botó i seleccionar un altre controlador."
 
 #: ../help.pm:794
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "As a review, DrakX will present a summary of information it has gathered\n"
 "about your system. Depending on the hardware installed on your machine, you\n"
@@ -1821,66 +1829,68 @@ msgstr ""
 "tenir algunes o totes les entrades següents. Cada entrada consta\n"
 "de l'element de configuració que cal configurar, seguit d'un breu\n"
 "resum de la configuració actual.\n"
-"Feu clic al botó \"%s\" corresponent per canviar-ho.\n"
+"Feu clic al botó «%s» corresponent per canviar-ho.\n"
 "\n"
-" * \"%s\": comproveu la configuració actual del mapa de teclat i\n"
+" * «%s»: comproveu la configuració actual del mapa de teclat i\n"
 "canvieu-la si és necessari.\n"
 "\n"
-" * \"%s\": comproveu la selecció actual de país. Si no sou a aquest\n"
-"país, feu clic al botó \"%s\" i escolliu-ne un altre. Si el vostre\n"
-"país no és a la primera llista que es mostra, feu clic al botó \"%s\"\n"
+" * «%s»: comproveu la selecció actual de país. Si no sou a aquest\n"
+"país, feu clic al botó «%s» i escolliu-ne un altre. Si el vostre\n"
+"país no és a la primera llista que es mostra, feu clic al botó «%s»\n"
 "per obtenir una llista de països completa.\n"
 "\n"
-" * \"%s\": per defecte, DrakX dedueix la vostra zona horària en\n"
-"funció del país que hagueu escollit. Aquí podeu fer clic al botó \"%s\"\n"
+" * «%s»: per defecte, DrakX dedueix la vostra zona horària en\n"
+"funció del país que hagueu escollit. Aquí podeu fer clic al botó «%s»\n"
 "si no fos correcta.\n"
 "\n"
-" * \"%s\": comproveu la configuració actual del ratolí i feu clic al\n"
+" * «%s»: comproveu la configuració actual del ratolí i feu clic al\n"
 "botó per canviar-la si fos necessari.\n"
 "\n"
-" * \"%s\": feu clic al botó \"%s\" per obrir l'auxiliar de configuració\n"
-"de la impressora. Consulteu el capítol corresponent de la ``Guia d'\n"
-"iniciació'' per tenir més informació sobre la configuració d'una nova\n"
-"impressora. Aquesta interfície és similar a la utilitzada durant la\n"
-"instal·lació.\n"
-"\n"
-" * \"%s\": si es detecta una targeta de so al vostre sistema, es\n"
+" * «%s»: si es detecta una targeta de so al vostre sistema, es\n"
 "mostra aquí. Si veieu que que no és la que realment teniu al sistema,\n"
 "podeu fer clic al botó per triar un altre controlador.\n"
 "\n"
-" * \"%s\": per defecte, DrakX configura la vostra interfície\n"
-"gràfica a una resolució de \"800x600\" or \"1024x768\". Si no us\n"
-"va bé, feu clic a \"%s\" per reconfigurar la interfície gràfica.\n"
-"\n"
-" * \"%s\": si es detecta una targeta de TV al sistema, es mostra\n"
-"aquí. Si en teniu una però no és detectada, feu clic a \"%s\" per\n"
+" * «%s»: si es detecta una targeta de TV al sistema, es mostra\n"
+"aquí. Si en teniu una però no és detectada, feu clic a «%s» per\n"
 "intentar configurar-la manualment.\n"
 "\n"
-" * \"%s\": si es detecta una targeta XDSI al sistema, es mostra\n"
-"aquí. Podeu fer clic a \"%s\" per canviar els paràmetres associats\n"
-"amb la targeta.\n"
+" * «%s»: feu clic al botó «%s» per a canviar els paràmetres associats\n"
+"amb la targeta si penseu que la configuració no és correcta.\n"
+"\n"
+" * «%s»: per defecte, DrakX configura la vostra interfície\n"
+"gràfica a una resolució de \"800x600\" o bé \"1024x768\". Si no us\n"
+"va bé, feu clic a «%s» per reconfigurar la interfície gràfica.\n"
+"\n"
+" * «%s»: si voleu configurar ara l'accés a Internet o a la xarxa local.\n"
+"Adreceu-vos a la documentació impresa o feu servir el Centre de Control\n"
+"de Mageia un cop acabada la instal·lació per a gaudir de l'ajuda en\n"
+"línia completa.\n"
 "\n"
-" * \"%s\": si voleu configurar ara l'accés a Internet o a la xarxa local.\n"
+" * «%s»: permet la configuració de les adreces dels servidors intermediaris\n"
+"HTTP i FTP si la màquina que esteu configurant està darrere d'un servidor\n"
+"intermediari.\n"
 "\n"
-" * \"%s\": aquesta entrada un permet redefinir el nivell de seguretat\n"
-"definit en un pas anterior ().\n"
+" * «%s»: aquesta opció us permet redefinir el nivell de seguretat definit\n"
+"en un pas anterior ().\n"
 "\n"
-" * \"%s\": si teniu previst connectar-vos a Internet, és bona idea\n"
-"protegir-vos d'intrusions instal·lant un tallafocs. Consulteu-ne\n"
-"els detalls a la secció corresponent de la ``Guia d'iniciació''.\n"
+" * «%s»: si teniu previst connectar-vos a Internet, és bona idea\n"
+"protegir-vos d'intrusions instal·lant un tallafoc. Consulteu-ne\n"
+"els detalls a la secció corresponent de la «Guia d'iniciació».\n"
 "\n"
-" * \"%s\": si voleu canviar la configuració del carregador d'arrencada,\n"
+" * «%s»: si voleu canviar la configuració del carregador d'arrencada,\n"
 "feu clic a aquest botó. Es recomana que això només ho facin els usuaris\n"
-"avançats.\n"
+"avançats. Adreceu-vos a la documentació impresa o bé l'ajuda en línia\n"
+"sobre la configuració del carregador d'arrencada del Centre de Control\n"
+"de Mageia.\n"
 "\n"
-" * \"%s\": aquí podreu acabar d'ajustar els serveis que s'executaran\n"
+" * «%s»: aquí podreu acabar d'ajustar els serveis que s'executaran\n"
 "en el vostre ordinador. Si teniu previst utilitzar aquesta màquina com\n"
 "a servidor, és aconsellable que reviseu aquesta configuració."
 
 #: ../help.pm:809
-#, fuzzy, c-format
+#, c-format
 msgid "TV card"
-msgstr "Targeta XDSI"
+msgstr "Targeta de TV"
 
 #: ../help.pm:809
 #, c-format
@@ -1893,9 +1903,9 @@ msgid "Graphical Interface"
 msgstr "Interfície gràfica"
 
 #: ../help.pm:861
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1907,12 +1917,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Feu clic a \"%s\" si voleu suprimir totes les dades i particions\n"
 "que hi ha en aquest disc dur. Aneu amb compte perquè, un cop\n"
diff --git a/perl-install/install/help/po/cs.po b/perl-install/install/help/po/cs.po
index e194f0cc1..60d039484 100644
--- a/perl-install/install/help/po/cs.po
+++ b/perl-install/install/help/po/cs.po
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2005-09-19 00:26+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.10.2\n"
 
 #: ../help.pm:14
@@ -129,7 +130,8 @@ msgstr "Chcete použít tuto vlastnost?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -139,24 +141,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Zde je vypsán seznam již existujících detekovaných oddílů na pevném disku.\n"
@@ -692,31 +698,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -732,14 +742,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1040,19 +1051,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1068,21 +1082,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1099,14 +1115,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "V této chvíli je potřeba ur�it, který(é) oddíl(y) budou použity pro "
 "instalaci\n"
@@ -1176,12 +1186,6 @@ msgstr ""
 "\n"
 "Více informací o jednotlivých druzích souborových systémů naleznete\n"
 "v kapitole o ext2fs v \"Referen�ní příru�ce\".\n"
-"\n"
-"Pokud instalujete na po�íta� PPC, je potřeba vytvořit malý oddíl HFS,\n"
-"tzv. \"bootstrap\" o minimální velikosti 1MB, který bude použit pro zavadě�\n"
-"Yaboot. Pokud vytvoříte tento oddíl větší, např. 50 MB, je to dobré místo "
-"pro\n"
-"uložení ramdisku a jádra pro situace záchrany disku."
 
 #: ../help.pm:526
 #, c-format
@@ -1221,34 +1225,40 @@ msgstr "Přepne mezi normální/expertním režimem"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Instala�ní program nalezl na disku více než jeden oddíl s Microsoft "
@@ -1308,8 +1318,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1583,7 +1594,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1687,7 +1698,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1877,7 +1888,7 @@ msgstr "Grafické rozhraní"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1888,12 +1899,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Klepněte na \"%s\", pokud chcete smazat všechna data a oddíly na tomto\n"
 "pevném disku. Bu�te opatrní, po odklepnutí tla�ítka \"%s\" nelze obnovit "
diff --git a/perl-install/install/help/po/cy.po b/perl-install/install/help/po/cy.po
index bb782ba49..4d8dcb7e1 100644
--- a/perl-install/install/help/po/cy.po
+++ b/perl-install/install/help/po/cy.po
@@ -135,7 +135,7 @@ msgstr "Ydych chi eisiau defnyddio'r nodwedd?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -145,24 +145,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Dyma'r rhaniadau Linux sydd wedi canfod ar eich disg caled.\n"
@@ -663,31 +663,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -703,14 +703,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1001,19 +1001,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1029,21 +1029,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1060,14 +1060,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Yn awr mae angen i chi ddewis pa raniadau i'w defnyddio ar gyfer gosodiad\n"
 "eich system Mageia. Os oes rhaniadau wedi eu diffinio eisoes, un\n"
@@ -1131,14 +1125,6 @@ msgstr ""
 "I dderbyn gwybodaeth am yr amrywiol systemau ffeil sydd ar gael, darllenwch "
 "y\n"
 " pennawd ar ext2fs yn y ``Reference Manual''.\n"
-"\n"
-"Os ydych yn gosod ar beiriant PPC, bydd angen i chi greu \"ymlwythwr\" \n"
-" bychan o leiaf 1MB o faint, fydd yn cael ei ddefnyddio gan ymlwythwr "
-"yaboot.\n"
-"Os ydych yn dewis gwneud y rhaniad rhywfaint yn fwy, dyweder tua 50MB, yna\n"
-"gall fod yn le defnyddiol i gadw cnewyllyn sbâr a delweddau ramdisk ar "
-"gyfer\n"
-" sefyllfaoedd cychwyn argyfyngus!"
 
 #: ../help.pm:526
 #, c-format
@@ -1178,34 +1164,34 @@ msgstr "Amnewid rhwng modd arferol/arbenigol"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Mae mwy nag un rhaniad Microsoft wedi ei ganfod ar eich disg caled.\n"
@@ -1262,8 +1248,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1539,7 +1525,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1641,7 +1627,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1832,7 +1818,7 @@ msgstr "Rhyngwyneb Graffigol"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1844,12 +1830,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Cliciwch \"%s\" os ydych am ddileu'r holl ddata a rhaniadau sy'n bresennol\n"
 "ar y disg. Byddwch ofalus, wedi i chi glicio \"%s\" ni fydd modd i chi\n"
diff --git a/perl-install/install/help/po/da.po b/perl-install/install/help/po/da.po
index c2095e22c..6126805cb 100644
--- a/perl-install/install/help/po/da.po
+++ b/perl-install/install/help/po/da.po
@@ -15,6 +15,7 @@ msgstr ""
 "PO-Revision-Date: 2006-03-05 18:46+0100\n"
 "Last-Translator: Keld Simonsen <keld@rap.dk>\n"
 "Language-Team:  <da@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,9 +31,9 @@ msgid ""
 "button will reboot your computer."
 msgstr ""
 "Før du går videre bør du læse betingelserne i licensen omhyggeligt.  Den "
-"omfatter hele Mageia distributionen. Hvis du er enig i alle "
-"betingelserne i den, så klik på '%s'-boksen. Hvis ikke, så vil klikning på "
-"\"%s\"-knappen genstarte din maskine."
+"omfatter hele Mageia distributionen. Hvis du er enig i alle betingelserne i "
+"den, så klik på '%s'-boksen. Hvis ikke, så vil klikning på \"%s\"-knappen "
+"genstarte din maskine."
 
 #: ../help.pm:20
 #, c-format
@@ -110,9 +111,9 @@ msgstr ""
 "Når du er færdig med at tilføje brugere, vil du blive spurgt om at vælge en "
 "bruger som automatisk kan logge ind på systemet når maskinen startes op. "
 "Hvis du er interesseret i denne facilitet (og ikke kærer dig synderligt om "
-"lokal sikkerhed), så vælg den ønskede bruger og vindueshåndtering og klik '%"
-"s'. Hvis du ikke er interesseret i denne facilitet, så afmarkér boksen med '%"
-"s'."
+"lokal sikkerhed), så vælg den ønskede bruger og vindueshåndtering og klik "
+"'%s'. Hvis du ikke er interesseret i denne facilitet, så afmarkér boksen med "
+"'%s'."
 
 #: ../help.pm:54
 #, c-format
@@ -132,7 +133,8 @@ msgstr "Ønsker du at bruge denne facilitet?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -142,24 +144,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Her er listet de eksisterende Linux-partitioner genkendt på din disk. Du kan "
@@ -199,11 +205,11 @@ msgid ""
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mageia installationen bliver distribueret på flere cdrom-er. Hvis en "
-"valgt pakke ligger på en anden cdrom, vil DrakX udskyde den nuværende cd og "
-"bede dig om at isætte den forespurgte cd. Hvis du ikke har den forespurgte "
-"cd ved hånden, så klik bare på '%s' - de tilsvarende pakker vil da ikke "
-"blive installerede."
+"Mageia installationen bliver distribueret på flere cdrom-er. Hvis en valgt "
+"pakke ligger på en anden cdrom, vil DrakX udskyde den nuværende cd og bede "
+"dig om at isætte den forespurgte cd. Hvis du ikke har den forespurgte cd ved "
+"hånden, så klik bare på '%s' - de tilsvarende pakker vil da ikke blive "
+"installerede."
 
 #: ../help.pm:95
 #, fuzzy, c-format
@@ -264,8 +270,8 @@ msgid ""
 "megabytes."
 msgstr ""
 "Det er nu tid til at angive hvilke pakker du vil installere på dit system. "
-"Der er tusindvis af pakker til dit Mageia system, og for at gøre det "
-"nemmere at håndtere dem er pakkerne blevet placeret i grupper af lignende "
+"Der er tusindvis af pakker til dit Mageia system, og for at gøre det nemmere "
+"at håndtere dem er pakkerne blevet placeret i grupper af lignende "
 "programmer.\n"
 "\n"
 "Mageia opdeler pakkegrupper i fire kategorier. Du kan vælge og vrage "
@@ -382,13 +388,13 @@ msgstr ""
 "!! NÃ¥r en server-pakke er blevet valgt, enten fordi du specielt valgte den "
 "individuelle pakke, eller fordi den var en del af en gruppe af pakker, vil "
 "du blive spurgt om at bekræfte at du virkelig ønsker at installere disse "
-"servere. Som standard under Mageia bliver installerede servere "
-"startet op ved opstart af maskinen. Selvom de er sikre og ikke har nogen "
-"kendte problemer på udgivelsestidspunktet for distributionen, er det absolut "
-"muligt at sikkerhedshuller blev opdaget efter at denne version af Mandriva "
-"Linux blev færdiggjort. Hvis du ikke véd hvad en bestemt tjeneste vil gøre "
-"eller hvorfor den skal installeres, så klik '%s' her. Et klik med '%s' her "
-"vil installere de nævnte servere og de vil blive startet automatisk under "
+"servere. Som standard under Mageia bliver installerede servere startet op "
+"ved opstart af maskinen. Selvom de er sikre og ikke har nogen kendte "
+"problemer på udgivelsestidspunktet for distributionen, er det absolut muligt "
+"at sikkerhedshuller blev opdaget efter at denne version af Mandriva Linux "
+"blev færdiggjort. Hvis du ikke véd hvad en bestemt tjeneste vil gøre eller "
+"hvorfor den skal installeres, så klik '%s' her. Et klik med '%s' her vil "
+"installere de nævnte servere og de vil blive startet automatisk under "
 "opstarten!!\n"
 "\n"
 "'%s'-valget deaktiverer advarselsdialogen, som vises hver gang "
@@ -686,31 +692,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -726,14 +736,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -776,8 +787,8 @@ msgstr ""
 "Windows-FAT- eller NTFS-partition. Størrelsesændringen kan fortages uden tab "
 "af data, hvis du i forvejen har defragmenteret Windows-partitionen. Det "
 "anbefales på det kraftigste at du laver en sikkerhedskopi først. Denne "
-"mulighed anbefales hvis du vil bruge både Mageia og Microsoft "
-"Windows på samme maskine.\n"
+"mulighed anbefales hvis du vil bruge både Mageia og Microsoft Windows på "
+"samme maskine.\n"
 "\n"
 "  Før du vælger denne løsning, bør du forstå at størrelsen på din Microsoft "
 "Windows partition vil blive mindre end da du startede. Du vil have mindre "
@@ -785,9 +796,9 @@ msgstr ""
 "nyt programmel.\n"
 "\n"
 " * '%s': Hvis du vil slette alle data på alle partitioner på denne disk og "
-"erstatte dem med dit nye Mageia-system, kan du vælge denne mulighed. "
-"Vær forsigtig, for du vil ikke være i stand til at fortryde denne handling "
-"efter at du har sagt ja.\n"
+"erstatte dem med dit nye Mageia-system, kan du vælge denne mulighed. Vær "
+"forsigtig, for du vil ikke være i stand til at fortryde denne handling efter "
+"at du har sagt ja.\n"
 "\n"
 "   !! Hvis du bruger denne mulighed vil alle eksisterende data på din disk "
 "gå tabt. !!\n"
@@ -975,13 +986,12 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"PÃ¥ det tidspunkt hvor du installerer Mageia er det sandsynligt at "
-"nogen af pakkerne er blevet opdaterede siden den oprindelige udgivelse. Fejl "
-"er måske blevet rettet, og sikkerhedsproblemer måske løst. Det er nu muligt "
-"for dig at hente disse ned fra internettet for at disse opdateringer kan "
-"komme dig til gode. Vælg '%s' hvis du har en fungerende internet- "
-"forbindelse eller '%s' hvis du foretrækker at installere opdaterede pakker "
-"senere.\n"
+"PÃ¥ det tidspunkt hvor du installerer Mageia er det sandsynligt at nogen af "
+"pakkerne er blevet opdaterede siden den oprindelige udgivelse. Fejl er måske "
+"blevet rettet, og sikkerhedsproblemer måske løst. Det er nu muligt for dig "
+"at hente disse ned fra internettet for at disse opdateringer kan komme dig "
+"til gode. Vælg '%s' hvis du har en fungerende internet- forbindelse eller "
+"'%s' hvis du foretrækker at installere opdaterede pakker senere.\n"
 "\n"
 "Valg af '%s' viser en liste af netsteder hvorfra opdateringer kan hentes. Du "
 "bør vælge en der er nær ved dig. Så vil et træ med pakkevalg blive vist: "
@@ -1028,19 +1038,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1056,21 +1069,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1087,18 +1102,12 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Nu skal du vælge hvilke partitioner som skal bruges til installering af dit "
-"Mageia system. Hvis partitionerne allerede er blevet defineret, "
-"enten fra en tidligere installation af GNU/Linux eller med et andet "
+"Mageia system. Hvis partitionerne allerede er blevet defineret, enten fra en "
+"tidligere installation af GNU/Linux eller med et andet "
 "partitioneringsværktøj, kan du bruge de eksisterende partitioner. Ellers "
 "skal disk-partitionerne defineres først.\n"
 "\n"
@@ -1159,12 +1168,6 @@ msgstr ""
 "\n"
 "For at få information om de forskellige tilgængelige filsystemstyper kan du "
 "læse kapitlet ext2fs i 'Referencemanualen'.\n"
-"\n"
-"Hvis du er i gang med at installere på en PPC-maskine skal du lave en lille "
-"HFS-'bootstrap'-partition på mindst 1 MB til Yaboot-systemstarteren. Hvis du "
-"vælger at lave partitionen en smule større, f.eks. 50 MB kan den være nyttig "
-"til at gemme en ekstra kerne og ramdisk-billede for nødsituationer ved "
-"opstart."
 
 #: ../help.pm:526
 #, c-format
@@ -1204,34 +1207,40 @@ msgstr "Skift mellem normal og ekspert-tilstand"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Mere end én Microsoft Windows partition er blevet genkendt på dit diskdrev. "
@@ -1288,8 +1297,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1318,9 +1328,9 @@ msgstr ""
 "konfigurationstrin forbliver tilgængelige, i lighed med en "
 "standardinstallation.\n"
 "\n"
-"\"Opgradér\"-valget bør fungere fint på Mageia-systemer som kører "
-"version '8.1' eller nyere. Udførelse af Opgradér på versioner tidligere end "
-"Mageia '8.1' er ikke anbefalet."
+"\"Opgradér\"-valget bør fungere fint på Mageia-systemer som kører version "
+"'8.1' eller nyere. Udførelse af Opgradér på versioner tidligere end Mageia "
+"'8.1' er ikke anbefalet."
 
 #: ../help.pm:594
 #, c-format
@@ -1415,8 +1425,8 @@ msgstr ""
 "\n"
 "Om UTF-8 (ISO 10646)-understøttelse. ISO 10646 er en ny tegnkodning som er "
 "beregnet til at dække alle eksiterende sprog. Dog er fuld understøttelse for "
-"dette i GNU/Linux stadig under udvikling. Af denne årsag vil Mageia' "
-"brug af UTF-8 afhænge af brugerens valg:\n"
+"dette i GNU/Linux stadig under udvikling. Af denne årsag vil Mageia' brug af "
+"UTF-8 afhænge af brugerens valg:\n"
 "\n"
 " * Hvis du vælger et sprog som har en lang tradition for tegnkodning (latin1 "
 "sprog, russisk, japansk, kinesisk, koreansk, thai, græsk, tyrkisk, de fleste "
@@ -1551,7 +1561,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1651,7 +1661,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1791,13 +1801,13 @@ msgstr ""
 "hvis du synes at konfigurationen er forkert.\n"
 "\n"
 " * \"%s\": Som standard vil DrakX opsætte din grafiske grænseflade i "
-"opløsningen 800x600 eller 1024x768. Hvis dette ikke passer dig, så klik på '%"
-"s'-knappen for at ændre på opsætningen.\n"
+"opløsningen 800x600 eller 1024x768. Hvis dette ikke passer dig, så klik på "
+"'%s'-knappen for at ændre på opsætningen.\n"
 "\n"
 " * \"%s\": Hvis du ønsker at konfigurere din adgang til internet eller "
 "lokalnet, kan du gøre dette nu. Kig i den trykte dokumentation eller brug "
-"Mageia Kontrolcenter efter installationen er afsluttet for at drage "
-"nytte af den fulde indbyggede vejledning. \n"
+"Mageia Kontrolcenter efter installationen er afsluttet for at drage nytte af "
+"den fulde indbyggede vejledning. \n"
 "\n"
 " * \"%s\": lader dig konfigurere HTTP- og FTP-proxyadresser, hvis maskinen, "
 "du installerer på, skal placeres bag en proxyserver.\n"
@@ -1837,7 +1847,7 @@ msgstr "Grafisk grænseflade"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1849,12 +1859,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Klik på '%s' hvis du ønsker at slette alle data og partitioner der ligger på "
 "dette diskdrev. Vær omhyggelig, efter klik på '%s' vil du ikke være i stand "
diff --git a/perl-install/install/help/po/de.po b/perl-install/install/help/po/de.po
index 506b016f2..82f5fb4a9 100644
--- a/perl-install/install/help/po/de.po
+++ b/perl-install/install/help/po/de.po
@@ -19,9 +19,10 @@ msgstr ""
 "Project-Id-Version: DrakX-de\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-12 12:22+0200\n"
-"PO-Revision-Date: 2005-09-20 17:12+0200\n"
-"Last-Translator: Frank Koester <frank@dueppel13.de>\n"
+"PO-Revision-Date: 2012-03-11 11:23+0100\n"
+"Last-Translator: Oliver Burger <obgr_seneca@mageia.org>\n"
 "Language-Team: deutsch\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +30,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 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"
@@ -37,10 +38,9 @@ msgid ""
 "button will reboot your computer."
 msgstr ""
 "Lesen Sie bitte aufmerksam die Lizenz, bevor Sie fortfahren. Sie umfasst\n"
-"die gesamte Mageia Distribution. Sollten Sie nicht in allen Punkten\n"
-"zustimmen, betätigen Sie bitte die Schaltfläche „%s“, um die Installation\n"
-"abzubrechen. Um mit der Installation fortzufahren, betätigen Sie die\n"
-"Schaltfläche „%s“."
+"die gesamte Mageia Distribution. Sollten Sie in allen Punkten\n"
+"zustimmen, betätigen Sie bitte die Schaltfläche „%s“. Wenn nicht wird ein\n"
+"Betätigen der Schaltfläche „%s“ ihren Computer neu starten."
 
 #: ../help.pm:20
 #, c-format
@@ -125,12 +125,12 @@ msgstr ""
 #: ../help.pm:54
 #, c-format
 msgid "User name"
-msgstr ""
+msgstr "Benutzername"
 
 #: ../help.pm:54
 #, c-format
 msgid "Accept user"
-msgstr ""
+msgstr "Benutzer akzeptieren"
 
 #: ../help.pm:54
 #, c-format
@@ -140,7 +140,8 @@ msgstr "Möchten Sie diese Möglichkeit nutzen?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -150,24 +151,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Sie erhalten die Liste, der auf Ihren Festplatten gefundenen GNU/Linux\n"
@@ -204,7 +209,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
 #: ../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"
@@ -212,12 +217,12 @@ msgid ""
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Die Mageia-Distribution wird auf mehreren CD-ROMs ausgeliefert. Es\n"
-"kann daher vorkommen, dass DrakX Pakete von anderen, als der\n"
-"Installations-CD-ROM installieren will. In diesem Fall wird es die aktuelle\n"
-"CD auswerfen und nach einer anderen fragen. Wenn Sie dieses CD nicht haben,\n"
-"klicken Sie einfach auf „%s“. Die entsprechenden Pakete werden in dem Fall\n"
-"nicht installiert."
+"Die Mageia-Distribution wird auf mehreren CD-ROMs ausgeliefert. Wenn\n"
+"ein ausgewähltes Paket sich auf einer anderen CD-ROM befindet, wird DrakX\n"
+"die aktuelle CD-ROM auswerfen und nach einer anderen fragen. Wenn Sie diese\n"
+"nicht zur Hand haben sollten, betätigen Sie die Schaltfläche „%s“, die "
+"entsprechenden\n"
+"Pakete werden dann nicht installiert."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -400,8 +405,7 @@ msgstr ""
 "!! Es kommt vor, dass Server- und Dienst-Pakete angewählt wurden - entweder\n"
 "absichtlich, oder als Paket einer ganzen Gruppe; sollte das der Fall sein,\n"
 "werden Sie nun gefragt, ob Sie diese wirklich installiert haben wollen.\n"
-"Unter Mageia werden installierte Server und Dienste automatisch "
-"beim\n"
+"Unter Mageia werden installierte Server und Dienste automatisch beim\n"
 "Betriebssystemstart gestartet. Selbst wenn zum Zeitpunkt, als die\n"
 "Distribution zusammengestellt wurde, keine Sicherheitslücken oder Fehler in\n"
 "diesen Paketen bekannt waren, ist natürlich nicht auszuschließen, dass\n"
@@ -502,7 +506,7 @@ msgstr ""
 #: ../help.pm:213
 #, c-format
 msgid "Hardware clock set to GMT"
-msgstr ""
+msgstr "Die Hardware-Uhr ist auf GMZ gestellt"
 
 #: ../help.pm:213
 #, c-format
@@ -719,31 +723,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -759,14 +767,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -851,7 +860,7 @@ msgstr "Verwende existierende Partition(en)"
 #: ../help.pm:370
 #, c-format
 msgid "Use the free space on the Microsoft Windows® partition"
-msgstr ""
+msgstr "Den freien Platz auf der Microsoft-Windows®-Partition nutzen"
 
 #: ../help.pm:370
 #, c-format
@@ -941,17 +950,17 @@ msgstr "Erstellen einer Autoinstallations-Diskette"
 #: ../help.pm:405
 #, c-format
 msgid "Replay"
-msgstr ""
+msgstr "Erneut durchführen"
 
 #: ../help.pm:405
 #, c-format
 msgid "Automated"
-msgstr ""
+msgstr "Automatisch"
 
 #: ../help.pm:405
 #, c-format
 msgid "Save packages selection"
-msgstr ""
+msgstr "Paketauswahl speichern"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -1081,19 +1090,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1109,21 +1121,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1140,14 +1154,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Sie müssen nun entscheiden, auf welche(n) Partition(en) Ihr neues Mandriva\n"
 "Linux System installiert werden soll. Falls bereits Partitionen existieren\n"
@@ -1165,7 +1173,7 @@ msgstr ""
 " * „%s“: Betätigen dieser Schaltfläche löscht alle Partitionen auf der\n"
 "markierten Festplatte.\n"
 "\n"
-" * „%s“: Dieser Punkt aktiviert die automatische ext3- und\n"
+" * „%s“: Dieser Punkt aktiviert die automatische ext4- und\n"
 "Swap-Partitionen-Erstellung im ungenutzten Bereich Ihrer Festplatte.\n"
 "\n"
 "„%s“: bietet Zugriff auf weitere Möglichkeiten:\n"
@@ -1218,28 +1226,21 @@ msgstr ""
 "\n"
 "Um mehr Informationen über die verschiedenen Dateisystemtypen zu erhalten,\n"
 "lesen Sie bitte das Kapitel ext2FS in der „Referenz“.\n"
-"\n"
-"Falls Sie die Installation auf einem PPC-Rechner vornehmen, sollten Sie\n"
-"eine mindestens 1MB, große HFS Start-Partition für den\n"
-"Betriebssystemstarter yaboot erstellen. Wenn Sie diese Partition etwas\n"
-"größer dimensionieren, etwa 50MB, haben Sie einen geeigneten Platz, um\n"
-"einen Rettungskern samt RamDisk abzulegen, um in Notfällen starten zu\n"
-"können."
 
 #: ../help.pm:526
 #, c-format
 msgid "Save partition table"
-msgstr ""
+msgstr "Partitionstabelle speichern"
 
 #: ../help.pm:526
 #, c-format
 msgid "Restore partition table"
-msgstr ""
+msgstr "Partitionstabelle wiederherstellen"
 
 #: ../help.pm:526
 #, c-format
 msgid "Rescue partition table"
-msgstr ""
+msgstr "Partitionstabelle retten"
 
 #: ../help.pm:526
 #, c-format
@@ -1249,12 +1250,12 @@ msgstr "Wechselmedien automatisch einhängen"
 #: ../help.pm:526
 #, c-format
 msgid "Wizard"
-msgstr ""
+msgstr "Assistent"
 
 #: ../help.pm:526
 #, c-format
 msgid "Undo"
-msgstr ""
+msgstr "Rückgängig machen"
 
 #: ../help.pm:526
 #, c-format
@@ -1266,34 +1267,40 @@ msgstr "In den Normal-Modus wechseln"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Es wurde mehr als eine Windows-Partition gefunden. Wählen Sie bitte, welche\n"
@@ -1352,8 +1359,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1520,7 +1528,7 @@ msgstr "Spanisch"
 #: ../help.pm:643
 #, c-format
 msgid "Use Unicode by default"
-msgstr ""
+msgstr "Standardmäßig Unicode benutzen"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
@@ -1629,7 +1637,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1709,8 +1717,7 @@ msgstr ""
 "starten. „%s“ bietet grafische Konfigurations- und Druckmenüs.\n"
 "\n"
 "Sie können diese Wahl später immer wieder ändern, indem Sie PrinterDrake\n"
-"aus dem Mageia Control Center starten und dort die Schaltfläche „%"
-"s“\n"
+"aus dem Mageia Control Center starten und dort die Schaltfläche „%s“\n"
 "betätigen."
 
 #: ../help.pm:768
@@ -1721,7 +1728,7 @@ msgstr "pdq"
 #: ../help.pm:724
 #, c-format
 msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
 
 #: ../help.pm:724
 #, c-format
@@ -1738,7 +1745,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1921,9 +1928,9 @@ msgstr ""
 "werfen."
 
 #: ../help.pm:809
-#, fuzzy, c-format
+#, c-format
 msgid "TV card"
-msgstr "ISDN-Karte"
+msgstr "TV-Karte"
 
 #: ../help.pm:809
 #, c-format
@@ -1940,7 +1947,7 @@ msgstr "Grafikumgebung"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1954,12 +1961,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Betätigen Sie die Schaltfläche „%s“, wenn Sie alle Partitionen und die\n"
 "darauf befindlichen Daten löschen wollen. Bedenken Sie, dass Sie nach\n"
@@ -1992,108 +2001,3 @@ msgstr "<- Zurück"
 #~ "Kapitel\n"
 #~ "des „Starter Handbuch“. Das dort vorgestellte Programm entspricht dem\n"
 #~ "während der Installation angebotenen."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandriva.com:/cooker/doc/manualB/modules/de/drakx-chapter.xml
-#~ msgid ""
-#~ "This is the most crucial decision point for the security of your GNU/"
-#~ "Linux\n"
-#~ "system: you must enter the \"root\" password. \"Root\" is the system\n"
-#~ "administrator and is the only user authorized to make updates, add "
-#~ "users,\n"
-#~ "change the overall system configuration, and so on. In short, \"root\" "
-#~ "can\n"
-#~ "do everything! That's why you must choose a password which is difficult "
-#~ "to\n"
-#~ "guess: DrakX will tell you if the password you chose is too simple. As "
-#~ "you\n"
-#~ "can see, you're not forced to enter a password, but we strongly advise\n"
-#~ "against this. GNU/Linux is just as prone to operator error as any other\n"
-#~ "operating system. Since \"root\" can overcome all limitations and\n"
-#~ "unintentionally erase all data on partitions by carelessly accessing the\n"
-#~ "partitions themselves, it is important that it be difficult to become\n"
-#~ "\"root\".\n"
-#~ "\n"
-#~ "The password should be a mixture of alphanumeric characters and at least "
-#~ "8\n"
-#~ "characters long. Never write down the \"root\" password -- it makes it "
-#~ "far\n"
-#~ "too easy to compromise your system.\n"
-#~ "\n"
-#~ "One caveat: do not make the password too long or too complicated because "
-#~ "you\n"
-#~ "must be able to remember it!\n"
-#~ "\n"
-#~ "The password will not be displayed on screen as you type it. To reduce "
-#~ "the\n"
-#~ "chance of a blind typing error you'll need to enter the password twice. "
-#~ "If\n"
-#~ "you do happen to make the same typing error twice, you'll have to use "
-#~ "this\n"
-#~ "``incorrect'' password the first time you'll try to connect as \"root\".\n"
-#~ "\n"
-#~ "If you want an authentication server to control access to your computer,\n"
-#~ "click on the \"%s\" button.\n"
-#~ "\n"
-#~ "If your network uses either LDAP, NIS, or PDC Windows Domain "
-#~ "authentication\n"
-#~ "services, select the appropriate one for \"%s\". If you do not know "
-#~ "which\n"
-#~ "one to use, you should ask your network administrator.\n"
-#~ "\n"
-#~ "If you happen to have problems with remembering passwords, or if your\n"
-#~ "computer will never be connected to the Internet and you absolutely "
-#~ "trust\n"
-#~ "everybody who uses your computer, you can choose to have \"%s\"."
-#~ msgstr ""
-#~ "Dies ist der wichtigste Punkt in der Absicherung Ihres neuen\n"
-#~ "GNU/Linux-Systems: Sie müssen das Passwort für „root“ eingeben. „root“ "
-#~ "ist\n"
-#~ "der Systemadministrator. Er ist der einzige der berechtigt ist, neue\n"
-#~ "Software zu installieren, Systemdateien zu ändern oder neue\n"
-#~ "Benutzer anzulegen. Kurz gesagt: „root“ darf alles! Daher müssen\n"
-#~ "Sie auch ein Passwort auswählen, was nicht leicht zu erraten ist; DrakX\n"
-#~ "teilt Ihnen mit, wenn das Passwort zu einfach ist. Sie sehen, dass es "
-#~ "auch\n"
-#~ "möglich ist, kein Passwort zu vergeben. Wir raten Ihnen jedoch dringend\n"
-#~ "davon ab! GNU/Linux ist genauso anfällig für Fehler wie jedes andere \n"
-#~ "Betriebssystem. »root« hat keine Beschränkungen. Er könnte beispielsweise\n"
-#~ "unbeabsichtigterweise alle Daten auf allen Partitionen löschen. Also "
-#~ "sollte\n"
-#~ "es schwierig gemacht werden, „root“ zu werden!\n"
-#~ "\n"
-#~ "Das Passwort sollte eine Mischung aus alphanumerischen Zeichen sein und\n"
-#~ "mindestens acht Zeichen lang. Es sollte niemals irgendwo aufgeschrieben\n"
-#~ "werden.\n"
-#~ "\n"
-#~ "Machen Sie das Passwort aber nicht zu lang oder zu kompliziert: Sie "
-#~ "sollten\n"
-#~ "es sich ohne großen Aufwand merken können.\n"
-#~ "\n"
-#~ "Bei der Eingabe des Passwortes wird nichts angezeigt. Um ein "
-#~ "Verschreiben\n"
-#~ "bei dieser „Blindeingabe“ zu vermeiden müssen Sie das Passwort zweimal\n"
-#~ "eingeben - ein Tippfehler beim ersten Versuch könnte sonst zu einem "
-#~ "Problem\n"
-#~ "werden, da Sie anschließend das „falsche“ Passwort bei der Verbindung "
-#~ "mit\n"
-#~ "dem System eingeben müssten.\n"
-#~ "\n"
-#~ "Wenn Sie wollen, dass der Zugang zu diesem Rechner über einen\n"
-#~ "Authentifizierungsserver verwaltet wird, betätigen Sie die Schaltfläche\n"
-#~ "„%s“.\n"
-#~ "\n"
-#~ "Falls in Ihrem Netzwerk LDAP, NIS oder PDC zur Authentifizierung "
-#~ "verwendet\n"
-#~ "wird, wählen Sie bitte den entsprechenden Menüpunkt für „%s“. Falls Sie "
-#~ "nicht\n"
-#~ "wissen, welches Protokoll Sie verwenden sollen, fragen Sie Ihren\n"
-#~ "Netzwerkadministrator.\n"
-#~ "\n"
-#~ "Wenn Sie Probleme haben, sich Passwörter zu merken, oder Ihr Computer "
-#~ "nie\n"
-#~ "mit dem Internet verbunden wird und Sie allen Benutzern Ihres Computers\n"
-#~ "absolut vertrauen, können Sie die Option „%s“ wählen."
-
-#~ msgid "authentication"
-#~ msgstr "Authentifizierung"
diff --git a/perl-install/install/help/po/el.po b/perl-install/install/help/po/el.po
index 8d86959bf..d5bde8de0 100644
--- a/perl-install/install/help/po/el.po
+++ b/perl-install/install/help/po/el.po
@@ -127,7 +127,7 @@ msgstr "Θέλετε να χÏ�ησιμοποιήσετε αυτή τη λειτÎ
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -137,24 +137,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Linux ανιχνε�θηκε\n"
@@ -672,31 +672,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -712,14 +712,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1010,19 +1010,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1038,21 +1038,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1069,14 +1069,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "\n"
 " Linux\n"
@@ -1190,34 +1184,34 @@ msgstr "Αλλαγή σε κανονικό τ�όπο λειτου�γίας"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Πε�ισσότε�ες των μία κατατμήσεις Windows β�έθηκαν στον δίσκο σας. Πα�ακαλώ \n"
@@ -1274,8 +1268,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1510,7 +1504,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1593,7 +1587,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1722,7 +1716,7 @@ msgstr "Γ�αφικό πε�ιβάλλον"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1734,12 +1728,12 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Κάντε κλικ στο \"Επόμενο ->\" εάν θέλετε να διαγ�άψετε όλα τα δεδομένα\n"
 "τις κατατμήσεις που β�ίσκονται στον σκλη�ό σας δίσκο. Π�οσοχή μετά\n"
diff --git a/perl-install/install/help/po/eo.po b/perl-install/install/help/po/eo.po
index 6b2836ee4..24b9180c0 100644
--- a/perl-install/install/help/po/eo.po
+++ b/perl-install/install/help/po/eo.po
@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2007-03-14 18:27+0100\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team:  <eo@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,8 +28,8 @@ msgid ""
 msgstr ""
 "AntaÅ­ ol daÅ­rigi, legu zorge la patent-regulojn. Ili kovras la tutan\n"
 "eldonaĵon de Mandriva Linukso. Se vi konsentas kun ĉiuj reguloj, kiujn\n"
-"la teksto enhavas, alklaku la keston \"%s\". Se ne, alklakante la butonon \"%"
-"s\"\n"
+"la teksto enhavas, alklaku la keston \"%s\". Se ne, alklakante la butonon "
+"\"%s\"\n"
 "restartigos vian komputilon."
 
 #: ../help.pm:20
@@ -135,7 +136,8 @@ msgstr "Ĉu vi deziras uzi tiun funkcion?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -145,24 +147,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Ĉi tie estas listigitaj la ekzistantaj linuksaj subdiskoj detektitaj sur via "
@@ -207,8 +213,7 @@ msgid ""
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"La instalado de Mageia estas eldonita sur pluraj KD-ROM-oj. Se "
-"elektita\n"
+"La instalado de Mageia estas eldonita sur pluraj KD-ROM-oj. Se elektita\n"
 "pakaĵo trovi�as sur alia KD-ROM-o, DrakX elĵetos la aktualan KD kaj petos "
 "vin enigi\n"
 "la postulatan. Se vi ne havas la postulatan kompaktdiskon ĉemane,\n"
@@ -293,8 +298,8 @@ msgstr ""
 "konfiguros vian sistemon tiel ke �i kongruas kiom eble plej kun la\n"
 "agordoj de Linux Standard Base.\n"
 "\n"
-"   Selekto de la grupo \"LSB\" instalos ankaÅ­ la seriojn de la kerno \"2.4"
-"\",\n"
+"   Selekto de la grupo \"LSB\" instalos ankaÅ­ la seriojn de la kerno "
+"\"2.4\",\n"
 "anstataÅ­ la defaÅ­ltan \"2.6\". Tio estas por certigi centelcentan LSB-"
 "kongruecon\n"
 "de la sistemo. Tamen, se vi ne selektas la grupon \"LSB\", vi ja\n"
@@ -718,31 +723,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -758,14 +767,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1074,19 +1084,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1102,21 +1115,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1133,14 +1148,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Nun vi devas elekti kiuj subdisko(j) estu uzata(j) por instalado\n"
 "de via Mandriva-Linuksa sistemo. Se jam estas difinitaj subdiskoj,\n"
@@ -1156,7 +1165,7 @@ msgstr ""
 "\n"
 " * \"%s\": tiu opcio forvi�as ĉiujn subdiskojn sur la selektita fiksdisko.\n"
 "\n"
-" * \"%s\": Tiu opcio ebligas vin krei aÅ­tomate subdiskojn de ext3 kaj swap\n"
+" * \"%s\": Tiu opcio ebligas vin krei aÅ­tomate subdiskojn de ext4 kaj swap\n"
 "en la libera spaco de via fiksdisko\n"
 "\n"
 "\"%s\": donas aliron al kromaj eblecoj:\n"
@@ -1207,13 +1216,6 @@ msgstr ""
 "\n"
 "Por akiri informojn pri la diversaj haveblaj dosier-sistem-tipoj, bonvolu\n"
 "legi la ĉapitron ext2FS en la ''Referenca Manlibro''.\n"
-"\n"
-"Se vi instalas sur PPC-ma�inon, vi deziros krei malgrandan HFS-\n"
-"''pra�argo''-subdiskon de almenaŭ 1 MB kiu uzotas de la yaboot-\n"
-"startigilo. Se vi volas iomete pligrandigi tiun subdiskon, ni diru 50 MB, "
-"vi\n"
-"povas ankaŭ uzi �in por stoki tie kromajn kerno- kaj ramdisk-bildojn por\n"
-"paneaj situacioj de startigo."
 
 #: ../help.pm:526
 #, c-format
@@ -1253,34 +1255,40 @@ msgstr "Ŝan�u inter normala/fakula re�imo"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Pli ol unu Microsoft-subdisko estas detektitaj sur via fiksdisko.\n"
@@ -1338,8 +1346,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1616,7 +1625,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1726,7 +1735,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1927,7 +1936,7 @@ msgstr "Grafika interfaco"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1940,12 +1949,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Alklaku \"%s\" se vi deziras forvi�i ĉiujn datenojn kaj subdiskojn kiuj "
 "trovi�as sur\n"
diff --git a/perl-install/install/help/po/es.po b/perl-install/install/help/po/es.po
index e0e4637d5..d1ac36b90 100644
--- a/perl-install/install/help/po/es.po
+++ b/perl-install/install/help/po/es.po
@@ -15,6 +15,7 @@ msgstr ""
 "PO-Revision-Date: 2005-04-24 11:46+0200\n"
 "Last-Translator: José Manuel Pérez <jmprodu@hotmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -140,7 +141,8 @@ msgstr "¿Desea usar esta característica?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -150,24 +152,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Aquí se listan las particiones Linux existentes que se detectaron en su\n"
@@ -283,8 +289,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Ahora es el momento de especificar los programas que desea instalar en su\n"
-"sistema. Hay miles de paquetes disponibles para Mageia, y para "
-"hacer\n"
+"sistema. Hay miles de paquetes disponibles para Mageia, y para hacer\n"
 "más simple el manejo de los paquetes, los mismos se han puesto en grupos de\n"
 "aplicaciones similares.\n"
 "\n"
@@ -736,31 +741,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -776,14 +785,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1094,19 +1104,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1122,21 +1135,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1153,14 +1168,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Ahora necesita elegir qué particiones se utilizarán para la instalación de\n"
 "su sistema Mageia. Si ya se han definido particiones, ya sea por\n"
@@ -1179,7 +1188,7 @@ msgstr ""
 " * \"%s\": esta opción borra todas las particiones sobre el disco\n"
 "seleccionado.\n"
 "\n"
-" * \"%s\": esta opción le permite crear particiones ext3 y swap\n"
+" * \"%s\": esta opción le permite crear particiones ext4 y swap\n"
 "automáticamente en el espacio libre de su disco rígido.\n"
 "\n"
 "\"%s\": le da acceso a características adicionales:\n"
@@ -1233,12 +1242,6 @@ msgstr ""
 "Para obtener información sobre los distintos tipos de sistemas de archivos\n"
 "disponibles, por favor lea el capítulo acerca de ext2FS del \"Manual de\n"
 "Referencia\".\n"
-"\n"
-"Si está instalando en una máquina PPC, querrá crear una pequeña partición\n"
-"HFS de \"bootstrap\" de al menos 1 MB que será utilizada por el cargador de\n"
-"arranque yaboot. Si opta por hacer la partición un poco más grande, digamos\n"
-"50 MB, puede ver que es un lugar útil para almacenar un núcleo y ramdisk\n"
-"alternativos para arrancar en situaciones de emergencia."
 
 #: ../help.pm:526
 #, c-format
@@ -1280,34 +1283,40 @@ msgstr "Cambiar entre el modo normal/experto"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Se ha detectado más de una partición Microsoft Windows en su disco rígido.\n"
@@ -1373,8 +1382,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1398,15 +1408,13 @@ msgstr ""
 "particionan sus discos, debería usar esta opción.\n"
 "\n"
 " * \"%s\": Esta clase de instalación le permite actualizar los paquetes que\n"
-"en este momento están instalados en su sistema Mageia. No se "
-"alteran\n"
+"en este momento están instalados en su sistema Mageia. No se alteran\n"
 "las particiones corrientes de sus discos ni los datos de los usuarios. La\n"
 "mayoría de los otros pasos de configuración permanecen disponibles y son\n"
 "similares a una instalación estándar.\n"
 "\n"
 "El uso de la opción \"Actualizar\" debería funcionar sin problemas para los\n"
-"sistemas Mageia que corren la versión \"8.1\" o una posterior. No "
-"se\n"
+"sistemas Mageia que corren la versión \"8.1\" o una posterior. No se\n"
 "recomienda realizar una actualización sobre versiones anteriores a\n"
 "Mageia versión \"8.1\"."
 
@@ -1658,7 +1666,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1764,7 +1772,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1966,7 +1974,7 @@ msgstr "Interfaz gráfica"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1980,12 +1988,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Haga clic sobre \"%s\" si desea borrar todos los datos y particiones\n"
 "presentes en esta unidad de disco. Tenga cuidado, luego de hacer clic sobre\n"
diff --git a/perl-install/install/help/po/et.po b/perl-install/install/help/po/et.po
index 9bf71b1d0..1db0995da 100644
--- a/perl-install/install/help/po/et.po
+++ b/perl-install/install/help/po/et.po
@@ -130,7 +130,7 @@ msgstr "Kas soovite seda lubada?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -140,24 +140,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Ülal on toodud kõik Teie kõvakettal olemasolevad Linuxi partitsioonid.\n"
@@ -691,31 +691,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -731,14 +731,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1050,19 +1050,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1078,21 +1078,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1109,14 +1109,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Nüüd peate valima partitsiooni(d), kuhu soovite Mageiai paigaldada.\n"
 "Kui need on juba olemas kas GNU/Linuxi varasema paigalduse või mõne muu\n"
@@ -1188,12 +1182,6 @@ msgstr ""
 "\n"
 "Lähemat infot erinevate failisüsteemitüüpide kohta leiab \"Süvateadmiste\n"
 "käsiraamatu\" (\"Reference Manual\") peatükist \"Linuxi failisüsteem\".\n"
-"\n"
-"Kui paigaldamine toimub PPC-masinas, tuleks luua vähemalt 1MB suurune\n"
-"väike HFS \"bootstrap\"-partitsioon, mida kasutab alglaadur yaboot. Kui Te\n"
-"aga teete selle partitsiooni natukene suuremaks (näiteks nii umbes 50MB),\n"
-"on see päris hea koht, kuhu hädaolukorraks paigutada tagavarakernel\n"
-"ja ramdisk-laadepildid."
 
 #: ../help.pm:526
 #, c-format
@@ -1233,34 +1221,34 @@ msgstr "Tava- ja ekspertrežiimi lülitamine"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Teie arvuti kõvakettal on rohkem kui üks Microsoft Windowsi partitsioon.\n"
@@ -1316,8 +1304,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1575,7 +1563,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1677,7 +1665,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1859,7 +1847,7 @@ msgstr "Graafiline kasutajaliides"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1871,12 +1859,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Valige \"%s\", kui soovite kustutada kõik sellel kettal asuvad\n"
 "partitsioonid. Ettevaatust, pärast \"%s\" klõpsamist ei ole enam\n"
diff --git a/perl-install/install/help/po/eu.po b/perl-install/install/help/po/eu.po
index cd3634239..b1e3003f8 100644
--- a/perl-install/install/help/po/eu.po
+++ b/perl-install/install/help/po/eu.po
@@ -11,25 +11,25 @@ msgstr ""
 "Project-Id-Version: DrakX-eu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-12 12:22+0200\n"
-"PO-Revision-Date: 2005-12-31 14:02+0100\n"
-"Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
+"PO-Revision-Date: 2014-10-05 15:08+0100\n"
+"Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
 "Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: Poedit 1.5.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 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"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
-"Aurrera jarraitu aurretik lizentziaren baldintzak arretaz irakurri. \n"
-"Mageia banaketa osoa hartzen du. Baldintza guztiekin ados \n"
+"Aurrera jarraitu aurretik lizentziaren baldintzak arretaz irakurri.\n"
+"Mageia banaketa osoa hartzen du. Baldintza guztiekin ados\n"
 "bazaude, hautatu \"%s\" laukia. Onartzen ez badituzu, \"%s\" botoian klik\n"
 "egin eta ordenagailua berrabiaraziko da."
 
@@ -116,12 +116,12 @@ msgstr ""
 #: ../help.pm:54
 #, c-format
 msgid "User name"
-msgstr ""
+msgstr "Erabiltzaile izena"
 
 #: ../help.pm:54
 #, c-format
 msgid "Accept user"
-msgstr ""
+msgstr "Erabiltzailea onartu"
 
 #: ../help.pm:54
 #, c-format
@@ -133,7 +133,8 @@ msgstr "Eginbide hau erabili nahi duzu?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -143,24 +144,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Hemen dituzu zure disko zurrunean detektatutako Linux partizioak.\n"
@@ -201,7 +206,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../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"
@@ -218,7 +223,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../help.pm:95
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
 "There are thousands of packages available for Mageia, and to make it\n"
@@ -348,7 +353,7 @@ msgstr "Instalazio minimo-minimoa"
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../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"
@@ -499,7 +504,7 @@ msgstr ""
 #: ../help.pm:213
 #, c-format
 msgid "Hardware clock set to GMT"
-msgstr ""
+msgstr "Hardware-erlojua GMT-an jarri "
 
 #: ../help.pm:213
 #, c-format
@@ -530,7 +535,7 @@ msgstr ""
 "aukeratu beharko duzu."
 
 #: ../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"
@@ -710,34 +715,38 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../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 drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -753,14 +762,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -844,7 +854,7 @@ msgstr "Erabili lehendik dagoen partizioa"
 #: ../help.pm:370
 #, c-format
 msgid "Use the free space on the Microsoft Windows® partition"
-msgstr ""
+msgstr "Microsoften Windows-eko ® partizioko espazio librea erabili ezazu"
 
 #: ../help.pm:370
 #, c-format
@@ -935,22 +945,22 @@ msgstr "Sortu auto-instalazioko disketea"
 #: ../help.pm:405
 #, c-format
 msgid "Replay"
-msgstr ""
+msgstr "Errepikatu"
 
 #: ../help.pm:405
 #, c-format
 msgid "Automated"
-msgstr ""
+msgstr "Automatizatuta"
 
 #: ../help.pm:405
 #, c-format
 msgid "Save packages selection"
-msgstr ""
+msgstr "Pakete-hautaketa gorde ezazu"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../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"
@@ -990,8 +1000,7 @@ msgstr ""
 "\n"
 "Klikatu \"%s\" partizioak eratzeko prest zaudenean.\n"
 "\n"
-"Klikatu \"%s\" Mageia sistema eragile berria instalatzeko beste "
-"partizio\n"
+"Klikatu \"%s\" Mageia sistema eragile berria instalatzeko beste partizio\n"
 " bat aukeratu nahi baduzu.\n"
 "\n"
 "Klikatu \"%s\" diskoan hondatutako blokeak aurkitzeko egiaztatuko diren\n"
@@ -1000,7 +1009,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../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"
@@ -1030,7 +1039,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../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"
@@ -1066,24 +1075,27 @@ msgstr "Segurtasun-administratzailea"
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1099,21 +1111,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1130,14 +1144,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Orain, Mageia sistema instalatzeko zein partizio erabiliko\n"
 "d(ir)en aukeratu behar duzu. Partizioak jadanik definituta badaude,\n"
@@ -1156,7 +1164,7 @@ msgstr ""
 " * \"%s\": aukera honek hautatutako disko zurruneko partizio guztiak \n"
 "ezabatzen ditu\n"
 "\n"
-" * \"%s\": aukera honekin automatikoki sor ditzakezu ext3 eta\n"
+" * \"%s\": aukera honekin automatikoki sor ditzakezu ext4 eta\n"
 "swap partizioak disko zurruneko leku librean\n"
 "\n"
 "\"%s\": eginbide gehiagotarako aukera ematen du:\n"
@@ -1209,27 +1217,21 @@ msgstr ""
 "\n"
 "Erabil daitezkeen fitxategi-sistema desberdinei buruzko informazioa\n"
 "lortzeko, irakurri ``Erreferentzia Eskuliburuko'' ext2FS kapitulua.\n"
-"\n"
-"PPC makina batean instalatu behar baduzu, gutxienez 1 Mbko HFS\n"
-"``bootstrap'' partizio txiki bat sortzea komeni zaizu, yaboot\n"
-"abioko kargatzaileak erabil dezan. Partizioa handixeagoa egitea hautatzen \n"
-"baduzu, adibidez 50 MBkoa, leku egokia izan daiteke ordezko nukleo bat\n"
-"eta ramdisk imajinak biltegiratzeko emergentziazko abioa egin ahal izateko."
 
 #: ../help.pm:526
 #, c-format
 msgid "Save partition table"
-msgstr ""
+msgstr "Partizio taula gorde"
 
 #: ../help.pm:526
 #, c-format
 msgid "Restore partition table"
-msgstr ""
+msgstr "Partizio taula berritu"
 
 #: ../help.pm:526
 #, c-format
 msgid "Rescue partition table"
-msgstr ""
+msgstr "Partizio taula berrezkuratu"
 
 #: ../help.pm:526
 #, c-format
@@ -1239,12 +1241,12 @@ msgstr "Euskarri aldagarriak automuntatzea"
 #: ../help.pm:526
 #, c-format
 msgid "Wizard"
-msgstr ""
+msgstr "Morroia"
 
 #: ../help.pm:526
 #, c-format
 msgid "Undo"
-msgstr ""
+msgstr "Desegin"
 
 #: ../help.pm:526
 #, c-format
@@ -1254,36 +1256,42 @@ msgstr "Aldatu modu normalera/aditu modura"
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../help.pm:536
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Microsoft partizio bat baino gehiago aurkitu dira zure disko zurrunean.\n"
@@ -1335,7 +1343,7 @@ msgstr ""
 "jasotzeko."
 
 #: ../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"
@@ -1346,8 +1354,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1423,7 +1432,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../help.pm:612
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1481,8 +1490,7 @@ msgstr ""
 "UTF-8 (unicode) euskarriari buruz: Unicode karaktere kodeketa berri bat da,\n"
 "existitzen diren hizkuntza guztiak hartu nahi dituena. Hala ere, "
 "berarentzako\n"
-"erabateko euskarria oraindik garatzen ari da GNU/Linux-en, Mageia-"
-"en\n"
+"erabateko euskarria oraindik garatzen ari da GNU/Linux-en, Mageia-en\n"
 "UTF-8 erabilera erabiltzailearen hautaketen araberakoa da:\n"
 "\n"
 " * Jatorrizko kodeketa ahaltsua duen hizkuntza bat aukeratzen baduzu \n"
@@ -1518,7 +1526,7 @@ msgstr "Gaztelania"
 #: ../help.pm:643
 #, c-format
 msgid "Use Unicode by default"
-msgstr ""
+msgstr "Modu lehenetsian Erabili Unikodea"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
@@ -1625,7 +1633,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1651,7 +1659,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../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"
@@ -1679,8 +1687,7 @@ msgid ""
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Inprimatzeko sistema bat hautatzeko unea da orain.Eeste sistema eragile \n"
-"batzuk bakarra eskainiko dizute, baina Mageia-ek bi eskaintzen "
-"ditu.\n"
+"batzuk bakarra eskainiko dizute, baina Mageia-ek bi eskaintzen ditu.\n"
 "Inprimaketa sistema bakoitza egokiago da konfigurazio mota batzuetarako.\n"
 "\n"
 " * \"%s\" -- ``print, do not queue'' esapidearen akronimoa da, eta aukera\n"
@@ -1712,7 +1719,7 @@ msgstr "pdq"
 #: ../help.pm:724
 #, c-format
 msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
 
 #: ../help.pm:724
 #, c-format
@@ -1729,7 +1736,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1772,7 +1779,7 @@ msgstr ""
 "botoian klik egin eta beste gidari bat hauta dezakezu."
 
 #: ../help.pm:794
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "As a review, DrakX will present a summary of information it has gathered\n"
 "about your system. Depending on the hardware installed on your machine, you\n"
@@ -1858,11 +1865,6 @@ msgstr ""
 " * \"%s\": egiaztatu uneko sagu konfigurazioa eta klikatu botoia aldatzea\n"
 "beharrezka bada.\n"
 "\n"
-" * \"%s\": \"%s\" botoian klikatzeak inprimagailu konfigurazio morroia\n"
-"irekiko du. Kontsultatu ``Hasiberrien Gida''n dagokion atala inprimagailu\n"
-"berri bat nola ezarri jakiteko. Bertan azaldutako interfazea instalazioan\n"
-" erabiltzen denaren antzekoa da.\n"
-"\n"
 " * \"%s\": zure sisteman soinu txartel bat detektatzen bada, hemen\n"
 " bistaratuko da. Bistaratutako soinu-txartela zure sisteman instalatuta "
 "dagoena ez dela Ikusten baduzu, botoian klikatu eta beste gidari bat\n"
@@ -1902,15 +1904,12 @@ msgstr ""
 "\n"
 " * \"%s\": sarrera honen bitartez zehatz doitu dezakezu zure makinan\n"
 "zein zerbitzu exekutatuko diren. Makina hau zerbitzari moduan erabiltzeko\n"
-"asmoa badaukazu ona litzateke ezarpen hau errepasatzea.zure makinan zein "
-"zerbitzu exekutatuko diren doitasunez \n"
-"kontrola dezakezu hemendik. Makina hau zerbitzari gisa erabiltzeko asmoa \n"
-"baduzu, konfigurazio hau berrikustea komeni zaizu."
+"asmoa badaukazu ona litzateke ezarpen hau errepasatzea."
 
 #: ../help.pm:809
-#, fuzzy, c-format
+#, c-format
 msgid "TV card"
-msgstr "ISDN txartela"
+msgstr "TB txartela"
 
 #: ../help.pm:809
 #, c-format
@@ -1925,9 +1924,9 @@ msgstr "Interfaze grafikoa"
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
 #: ../help.pm:861
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1941,12 +1940,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Sakatu \"%s\" disko zurrun honetako datu eta partizio guztiak \n"
 "ezabatu nahi badituzu. Kontuz ibili, \"%s\" sakatu ondoren \n"
@@ -1966,117 +1967,3 @@ msgstr "Hurrengoa ->"
 #, c-format
 msgid "<- Previous"
 msgstr "<- Aurrekoa"
-
-#~ msgid ""
-#~ "\"%s\": clicking on the \"%s\" button will open the printer "
-#~ "configuration\n"
-#~ "wizard. Consult the corresponding chapter of the ``Starter Guide'' for "
-#~ "more\n"
-#~ "information on how to set up a new printer. The interface presented in "
-#~ "our\n"
-#~ "manual is similar to the one used during installation."
-#~ msgstr ""
-#~ "\"%s\": \"%s\" botoian klik eginda inprimagailuak konfiguratzeko morroia\n"
-#~ "irekiko da. Begiratu \"Starter Guide\"/\"Hasiberrien Gida\"-n dagokion\n"
-#~ "kapitulua inprimagailu berria nola ezarri jakiteko. Gure eskuliburuan \n"
-#~ "aurkeztutako interfazea instalazio garaian erabilitakoaren antzekoa da."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandriva.com:/cooker/doc/manual/literal/drakx/eu/drakx-help.xml
-#~ msgid ""
-#~ "This is the most crucial decision point for the security of your GNU/"
-#~ "Linux\n"
-#~ "system: you must enter the \"root\" password. \"Root\" is the system\n"
-#~ "administrator and is the only user authorized to make updates, add "
-#~ "users,\n"
-#~ "change the overall system configuration, and so on. In short, \"root\" "
-#~ "can\n"
-#~ "do everything! That's why you must choose a password which is difficult "
-#~ "to\n"
-#~ "guess: DrakX will tell you if the password you chose is too simple. As "
-#~ "you\n"
-#~ "can see, you're not forced to enter a password, but we strongly advise\n"
-#~ "against this. GNU/Linux is just as prone to operator error as any other\n"
-#~ "operating system. Since \"root\" can overcome all limitations and\n"
-#~ "unintentionally erase all data on partitions by carelessly accessing the\n"
-#~ "partitions themselves, it is important that it be difficult to become\n"
-#~ "\"root\".\n"
-#~ "\n"
-#~ "The password should be a mixture of alphanumeric characters and at least "
-#~ "8\n"
-#~ "characters long. Never write down the \"root\" password -- it makes it "
-#~ "far\n"
-#~ "too easy to compromise your system.\n"
-#~ "\n"
-#~ "One caveat: do not make the password too long or too complicated because "
-#~ "you\n"
-#~ "must be able to remember it!\n"
-#~ "\n"
-#~ "The password will not be displayed on screen as you type it. To reduce "
-#~ "the\n"
-#~ "chance of a blind typing error you'll need to enter the password twice. "
-#~ "If\n"
-#~ "you do happen to make the same typing error twice, you'll have to use "
-#~ "this\n"
-#~ "``incorrect'' password the first time you'll try to connect as \"root\".\n"
-#~ "\n"
-#~ "If you want an authentication server to control access to your computer,\n"
-#~ "click on the \"%s\" button.\n"
-#~ "\n"
-#~ "If your network uses either LDAP, NIS, or PDC Windows Domain "
-#~ "authentication\n"
-#~ "services, select the appropriate one for \"%s\". If you do not know "
-#~ "which\n"
-#~ "one to use, you should ask your network administrator.\n"
-#~ "\n"
-#~ "If you happen to have problems with remembering passwords, or if your\n"
-#~ "computer will never be connected to the Internet and you absolutely "
-#~ "trust\n"
-#~ "everybody who uses your computer, you can choose to have \"%s\"."
-#~ msgstr ""
-#~ "Hau da erabaki puntu garrantzitsuena zure GNU/Linux sistemaren\n"
-#~ " segurtasunerako: \"root\" pasahitza idatzi behar duzu. \"Root\" sistema\n"
-#~ " administratzailea da eta berak bakarrik dauka sistema eguneratu,\n"
-#~ " erabiltzaileak erantsi, konfigurazio orokorra aldatu eta "
-#~ "horrelakoetarako\n"
-#~ " baimena. Labur esateko, \"root\"ek guztia egin dezake! Horregatik "
-#~ "aukeratu\n"
-#~ "behar duzu asmatzeko zaila den pasahitza. DrakX-k esango dizu aukeratzen\n"
-#~ "duzun pasahitza errazegia den. Ikus dezakezunez ez zaude pasahitz bat\n"
-#~ "sartzera behartuta, baino biziki gomendatzen dizugu horrelakorik ez "
-#~ "egitea.\n"
-#~ "GNU/Linux, erabilzaileen akatsetara beste edozein sistema eragilek adina\n"
-#~ " joera dauka. \"root\"-ek muga guztiak gaindi ditzakeenez eta nahi gabe\n"
-#~ " partizioetako datu guztiak ezaba ditzakeenez beraietara behar bezain\n"
-#~ "kontuz ez sartzeagatik, garrantzi handia dauka \"root\" gisa sartzea\n"
-#~ "zaila izatea.\n"
-#~ "\n"
-#~ "Pasahitzak karaktere alfanumerikoen nahasketa izan behar luke, gutxienez\n"
-#~ "8 karakterekoa. Ez idatzi inon \"root\" pasahitza - zure sistema "
-#~ "arriskuan\n"
-#~ "jartzea izugarri errazten du.\n"
-#~ "\n"
-#~ "Oharra - ez egin pasahitza luzeegia edo konplexuegia, gero zuk "
-#~ "gogoratzeko\n"
-#~ "modukoa izan behar baitu!\n"
-#~ "\n"
-#~ "Pasahitza ez da pantailan bistaratuko zuk idatzi bitartean. Tekleatzean\n"
-#~ "egindako akatsak saihesteko, pasahitza bi aldiz idatzi beharko duzu.\n"
-#~ "Akats tipografiko bera bil aldiz egiten baduzu, pasahitz ``oker'' hori "
-#~ "erabili\n"
-#~ " beharko duzu \"root\" bezela konektatzen zaren lehen aldian.\n"
-#~ "\n"
-#~ "Ordenagailu honen sarbidea autentifikazio-zerbitzari batek kontrolatzea\n"
-#~ "nahi baduzu, egin klik \"%s\" botoian.\n"
-#~ "\n"
-#~ "Zure sareak LDAP, NIS, edo PDC Windows domeinuen autentifikazio\n"
-#~ " zerbitzuak erabiltzen baditu, hautatu \"%s\"ri dagokiona. Zein erabili "
-#~ "ez\n"
-#~ " badakizu, galdetu sare-administratzaileari.\n"
-#~ "\n"
-#~ "Pasahitzak gogoratzeko arazoak badituzu, edo zure ordenagailua inoiz ez\n"
-#~ " bada Internetera konektatuta egongo eta konfiantza osoa baduzu\n"
-#~ " ordenagailua erabiltzen duten guztiengan, \"%s\" hauta dezakezu."
-
-#~ msgid "authentication"
-#~ msgstr "egiaztatzea"
diff --git a/perl-install/install/help/po/fa.po b/perl-install/install/help/po/fa.po
index c86c0b496..220fd90a2 100644
--- a/perl-install/install/help/po/fa.po
+++ b/perl-install/install/help/po/fa.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2005-02-26 06:31+0100\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -132,7 +133,8 @@ msgstr "آیا می‌خواهید از این قابلیت استÙ�اده Ú©Ù†Û
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -142,24 +144,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "قسمت‌بندی‌های لینوکس شناسائی شده‌ی موجود بر دیسک شما در اینجا �هرست شده‌اند.\n"
@@ -201,8 +207,8 @@ msgid ""
 msgstr ""
 "نصب لینوکس ماندریبا در چند سی‌دی پخش شده است. اگر بسته انتخاب شده بر روی\n"
 "سی‌دی دیگری قرار دارد DrakX سی‌دی کنونی را بیرون زده و از شما میخواهد که\n"
-"سی‌دی خواسته شده را داخل کنید. اگر آن سی‌دی مورد تقاضا را ندارید �قط بر روی \"%"
-"s\"\n"
+"سی‌دی خواسته شده را داخل کنید. اگر آن سی‌دی مورد تقاضا را ندارید �قط بر روی "
+"\"%s\"\n"
 "کلیک کنید و بسته‌های مربوطه نصب نخواهند شد."
 
 #: ../help.pm:95
@@ -284,8 +290,8 @@ msgstr ""
 "از آن رده انتخاب کنید. گروه مخصوص \"LSB\" سیستمتان را طوری پیکربندی\n"
 "خواهد کرد تا هر چه بیشتر با مقررات پایه استاندارد لینوکس مطابقت داشته باشد.\n"
 "\n"
-"   انتخاب گروه \"LSB\" همچنین سریال هسته \"2.4\" را نیز بجای پیش �رض \"2.6"
-"\" \n"
+"   انتخاب گروه \"LSB\" همچنین سریال هسته \"2.4\" را نیز بجای پیش �رض "
+"\"2.6\" \n"
 "نصب خواهد کرد. این برای اطمینان ۱۰۰٪٪-مطابقت سیستم است. هر چند، اگر گروه\n"
 "\"LSB\" را انتخاب نکنید سیستمی خواهید داشت که تقریبا ۱۰۰٪٪ LSB-تطبیق دارد.\n"
 "\n"
@@ -698,31 +704,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -738,14 +748,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1038,19 +1049,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1066,21 +1080,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1097,14 +1113,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "در این نقطه، شما مجبور به انتخاب قسمت‌بندی(های) که برای نصب سیستم لینوکس \n"
 "ماندریبا است�اده خواهد شد هستید.اگر قسمت‌بندی‌هایی که یا از یک نصب قبلی \n"
@@ -1121,7 +1131,7 @@ msgstr ""
 " * \"%s\": این گزینه تمام قسمت‌بندی‌های روی دیسک انتخاب شده را حذ� می‌کند\n"
 "\n"
 " * \"%s\": این گزینه بر روی �ضای آزاد دیسک شما بطور خودکار قسمت‌بندی‌های\n"
-"ext3 و حا�ظه مبادله را ایجاد می‌کند\n"
+"ext4 و حا�ظه مبادله را ایجاد می‌کند\n"
 "\n"
 "\"%s\": دسترسی به قابلیت‌های دیگر را �راهم می‌سازد\n"
 "\n"
@@ -1171,12 +1181,6 @@ msgstr ""
 "\n"
 "برای دریا�ت اطلاعات درباره انواع سیستم پرونده موجود، لط�اً �صل ext2FS \n"
 "را از ` دستورالعمل مرجع'' بخوانید.\n"
-"\n"
-"اگر شما بر یک ماشین PPC نصب می‌کنید، شما باید یک قسمت‌بندی کوچک HFS \n"
-"``bootstrap'' حداقل ۱ مگابایت که برای بارگذار آغازگر yaboot\n"
-"است�اده می‌شود را ایجاد کنید اگر شما بطور اختیاری آن قسمت‌بندی را بزرگتر\n"
-"بسازید، مثلاً ۵۰ مگابایت، شما آن را برای انبار یک هسته یدک و تصاویر ramdisk\n"
-"در شرایط آغازگری اضطراری م�ید خواهید یا�ت."
 
 #: ../help.pm:526
 #, c-format
@@ -1216,34 +1220,40 @@ msgstr "تعویض بین حالت عادی/کارشناسی"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "بیش از یک قسمت‌بندی مایکروسا�ت بر دیسک شما شناسایی شده است. \n"
@@ -1302,8 +1312,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1568,7 +1579,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1674,7 +1685,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1867,7 +1878,7 @@ msgstr "واسط گرا�یکی"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1879,12 +1890,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "اگر می‌خواهید تمام داده‌ها و قسمت‌بندی‌های موجود بر این دیسک را حذ� کنید \n"
 "بر \"%s\" کلیک نمایید. دقت کنید که بعد از کلیک بر \"%s\"، دیگر نمی‌توانید\n"
diff --git a/perl-install/install/help/po/fi.po b/perl-install/install/help/po/fi.po
index 871e07d78..63456bdfe 100644
--- a/perl-install/install/help/po/fi.po
+++ b/perl-install/install/help/po/fi.po
@@ -130,7 +130,7 @@ msgstr "Haluatko käyttää tätä ominaisuutta?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -140,24 +140,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Tässä on listaus olemassa olevista tunnistetuista Linux-osioista\n"
@@ -689,31 +689,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -729,14 +729,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1031,19 +1031,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1059,21 +1059,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1090,14 +1090,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Tässä vaiheessa sinun pitää määrittää mitkä osiot käytetään Mageia\n"
 "-järjestelmäsi asennuksessa. Jos osioita on jo määritelty, joko\n"
@@ -1115,7 +1109,7 @@ msgstr ""
 " * \"%s\": tämä toiminto poistaa kaikki osiot kiintolevyllä\n"
 "\n"
 " * \"%s\": tämä toiminto luo automaattisesti\n"
-"tarvittavat ext3-osiot ja sivutusosion levyn tyhjästä tilasta\n"
+"tarvittavat ext4-osiot ja sivutusosion levyn tyhjästä tilasta\n"
 "\n"
 "\"%s\": näyttää seuraavat lisätoiminnot:\n"
 "\n"
@@ -1164,12 +1158,6 @@ msgstr ""
 "\n"
 "Saadaksesi lisätietoja käytettävissä olevista tiedostojärjestelmistä,\n"
 "lue lisää ``Reference Manual'':sta osasta ext2FS.\n"
-"\n"
-"Jos olet asentamassa PPC-koneelle, sinun pitää luoda pieni HFS\n"
-"``bootstrap''-osio kooltaan vähintään 1Mt, joka tulee Yaboot\n"
-"käynnistyslataajan käyttöön. Jos päätät tehdä osiosta vähän suuremman,\n"
-"esim. 50Mt, on hyvä ajatus asentaa ylimääräinen ydin ja ramdisk-kuva\n"
-"virhetilanteiden käynnistystarpeeseen."
 
 #: ../help.pm:526
 #, c-format
@@ -1209,34 +1197,34 @@ msgstr "Vaihda vakio-/asiantuntijatilan välillä"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Useampi kuin yksi Microsoft-osio on löydetty kiintolevyltäsi. Ole hyvä\n"
@@ -1295,8 +1283,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1557,7 +1545,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1659,7 +1647,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1844,7 +1832,7 @@ msgstr "Graafinen käyttöliittymä"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1856,12 +1844,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Valitse \"%s\" jos haluat tuhota kaiken tällä kiintolevyllä olevan\n"
 "tiedon sekä osiot. Ole varovainen, sillä valittuasi \"%s\"\n"
diff --git a/perl-install/install/help/po/fr.po b/perl-install/install/help/po/fr.po
index b63114296..ab7769137 100644
--- a/perl-install/install/help/po/fr.po
+++ b/perl-install/install/help/po/fr.po
@@ -61,7 +61,7 @@
 # Pablo Saratxaga <pablo@mandriva.com>, 2001, 2005.
 # KAtiOS <katios@nolabel.net>, 2001.
 # Guillaume Cottenceau <gc@mandriva.com>, 2001-2002.
-# Thierry Vignaud <tvignaud@mandriva.com>, 2001-2004.
+# Thierry Vignaud <thierry.vignaud.com>, 2001-2004.
 # Christophe Combelles <ccomb@free.fr>, 2002,2003.
 # Adrien REZER <monsieurdidi@free.fr>, 2003.
 # RICHARD Nicolas <richardnicolas22@yahoo.fr>, 2004.
@@ -75,19 +75,20 @@ msgstr ""
 "Project-Id-Version: DrakX-fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-12 12:22+0200\n"
-"PO-Revision-Date: 2008-09-24 15:29+0200\n"
-"Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
-"Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
+"PO-Revision-Date: 2013-04-25 17:02+0100\n"
+"Last-Translator: Yann Ciret <mageia@zamiz.net>\n"
+"Language-Team: French <i18n-fr@ml.mageia.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Poedit 1.5.5\n"
 "Plural-Forms: nplurals=2;plural=(n>1);\n"
+"Language: fr\n"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../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"
@@ -195,7 +196,8 @@ msgstr "Voulez-vous utiliser cette fonctionnalité ?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -205,24 +207,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "La liste présentée plus haut identifie les partitions GNU/Linux détectées\n"
@@ -244,7 +250,8 @@ msgstr ""
 "Le « type de disque dur » correspond à hd si votre disque est IDE. Pour un\n"
 "disque SCSI, vous lirez « sd ».\n"
 "\n"
-"Le « numéro du disque » est toujours listé après le « hd » ou « sd ». Pour les\n"
+"Le « numéro du disque » est toujours listé après le « hd » ou « sd ». Pour "
+"les\n"
 "disques durs IDE :\n"
 "\n"
 " * « a » signifie « disque primaire maître sur le premier contrôleur IDE »;\n"
@@ -264,7 +271,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../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"
@@ -272,8 +279,7 @@ msgid ""
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Les paquetages requis à l'installation de Mageia sont distribués "
-"sur\n"
+"Les paquetages requis à l'installation de Mageia sont distribués sur\n"
 "plusieurs CD-ROM. Si un paquetage requis se trouve sur un autre CD-ROM,\n"
 "DrakX éjectera celui présent dans le lecteur et vous demandera d'insérer le\n"
 "CD-ROM approprié. Si vous ne possédez pas le CD demandé, cliquez tout\n"
@@ -283,7 +289,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../help.pm:95
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
 "There are thousands of packages available for Mageia, and to make it\n"
@@ -354,15 +360,14 @@ msgstr ""
 "\n"
 " * « %s » : si votre système doit être utilisé pour la programmation,\n"
 "choisissez les groupes désirés. Le groupe spécial « LSB » configurera votre\n"
-"système de manière à ce qu'il corresponde le plus possible avec la Linux\n"
-"Standard Base.\n"
+"système de manière à ce qu'il corresponde le plus possible\n"
+"aux spécifications Linux Standard Base.\n"
 "\n"
-"   Si vous choisissez le groupe « LSB », cela assurera\n"
-"une compatibilité LSB maximale. Cependant, si vous ne sélectionnez pas ce\n"
-"groupe « LSB » vous aurez quand même un système presque entièrement\n"
-"compatible LSB.\n"
+"   Si vous choisissez le groupe « LSB », cela assurera une compatibilité\n"
+"LSB maximale. Cependant, si vous ne sélectionnez pas ce groupe « LSB »\n"
+"vous aurez quand même un système presque entièrement compatible LSB.\n"
 "\n"
-" * « %s » : enfin, si votre système doit fonctionner en tant que serveur,\n"
+" * « %s » : si votre système doit fonctionner en tant que serveur,\n"
 "vous pourrez sélectionner les services que vous voulez installer.\n"
 "\n"
 " * « %s » : ce groupe vous permettra de déterminer quel environnement\n"
@@ -372,8 +377,8 @@ msgstr ""
 "En plaçant votre souris au-dessus d'un nom de groupe, vous verrez\n"
 "apparaître une courte description de ce groupe.\n"
 "\n"
-"Vous pouvez enfin cocher l'option « %s ». Cette option est à utiliser si\n"
-"vous connaissez exactement le paquetage désiré ou si vous voulez avoir le\n"
+"Vous pouvez cocher l'option « %s ». Cette option est à utiliser si vous\n"
+"connaissez exactement le paquetage désiré ou si vous voulez avoir le\n"
 "contrôle total de votre installation.\n"
 "\n"
 "Si vous avez démarré l'installation en mode « %s », vous pouvez\n"
@@ -412,7 +417,7 @@ msgid "Truly minimal install"
 msgstr "Installation réellement minimale"
 
 #: ../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"
@@ -448,7 +453,7 @@ msgid ""
 "another installation. See the second tip of the last step on how to create\n"
 "such a floppy."
 msgstr ""
-"Enfin, si vous avez choisi de sélectionner individuellement les paquetages\n"
+"Si vous avez choisi de sélectionner individuellement les paquetages\n"
 "à installer, DrakX vous présentera un arbre contenant tous les paquetages,\n"
 "classés par groupes et sous-groupes. En navigant à travers l'arbre, vous\n"
 "pouvez sélectionner des groupes, des sous-groupes ou des paquetages\n"
@@ -464,8 +469,8 @@ msgstr ""
 "est possible que certaines failles de sécurité affectent les serveurs\n"
 "installés au-delà de la date de publication. Si vous ne savez pas\n"
 "précisément à quoi sert un service en particulier ou pourquoi il est\n"
-"installé, cliquez sur « %s ». En cliquant sur « %s », le serveur sera\n"
-"installé et le service rendu disponible au démarrage. !!\n"
+"installé, cliquez sur « %s ». En cliquant sur « %s », les services listés\n"
+"seront installés et rendus disponible au démarrage. !!\n"
 "\n"
 "L'option « %s » désactive les avertissements qui apparaissent à chaque fois\n"
 "que l'installeur sélectionne un nouveau paquetage. Parfois, pour qu'un\n"
@@ -593,7 +598,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../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"
@@ -672,10 +677,10 @@ msgstr ""
 "\n"
 "Moniteur\n"
 "\n"
-"   Le programme d'installation détecte et configure automatiquement les\n"
-"moniteurs connectés à votre unité centrale. Si ce n'est pas le cas, vous\n"
-"pouvez choisir dans cette liste le moniteur que vous utilisez\n"
-"effectivement.\n"
+"   Normalement le programme d'installation détecte et configure\n"
+"automatiquement les moniteurs connectés à votre machine. Si ce\n"
+"n'est pas le cas, vous pouvez choisir dans cette liste le moniteur que\n"
+"vous utilisez effectivement.\n"
 "\n"
 "\n"
 "\n"
@@ -684,7 +689,7 @@ msgstr ""
 "   Vous pouvez choisir ici la résolution et nombre de couleurs parmi celles\n"
 "disponibles pour votre matériel. Choisissez la configuration optimale pour\n"
 "votre utilisation (vous pourrez néanmoins modifier cela après\n"
-"l'installation). Un échantillon de la configuration choisie apparaît dans\n"
+"l'installation). Un exemple de la configuration choisie apparaît dans\n"
 "le dessin du moniteur.\n"
 "\n"
 "\n"
@@ -697,14 +702,15 @@ msgstr ""
 "choisie. Si vous pouvez voir le message pendant le test, et répondez\n"
 "« %s », alors DrakX passera à l'étape suivante. Si vous ne pouvez pas voir\n"
 "de message, cela signifie que vos paramètres sont incompatibles, et le test\n"
-"se terminera automatiquement après 12 secondes. Changez la configuration\n"
-"jusqu'à obtenir un affichage correct lors du test.\n"
+"se terminera automatiquement après 12 secondes et vous ramènera au\n"
+"menu. Changez la configuration jusqu'à obtenir un affichage correct lors\n"
+"du test.\n"
 "\n"
 "\n"
 "\n"
 "Options\n"
 "\n"
-"   Vous pourrez également choisir ici de démarrer l'interface graphique au\n"
+"   Vous pourrez choisir ici de démarrer l'interface graphique au\n"
 "lancement de la machine. Il est préférable de choisir « %s » si vous êtes\n"
 "en train d'installer un serveur, ou si vous n'avez pas réussi à configurer\n"
 "l'écran correctement."
@@ -780,34 +786,38 @@ msgstr ""
 "l'écran correctement."
 
 #: ../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 drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -823,14 +833,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -847,29 +858,29 @@ msgstr ""
 "installation de Mageia. Si votre disque est vide ou utilisé par un\n"
 "autre système d'exploitation, vous devrez repartitionner votre disque.\n"
 "Partitionner un disque désigne l'opération consistant à le diviser\n"
-"précisément afin de créer un espace pour votre installation.\n"
+"logiquement afin de créer un espace pour votre installation.\n"
 "\n"
-"Comme les effets du partitionnement sont irréversibles (l'ensemble du\n"
-"disque est effacé), le partitionnement est généralement intimidant et\n"
-"stressant pour un utilisateur inexpérimenté. Heureusement, un assistant a\n"
-"été prévu à cet effet. Avant de commencer, lisez le reste de ce document et\n"
-"surtout, prenez votre temps.\n"
+"Comme les effets du partitionnement sont généralement irréversibles, \n"
+"le partitionnement est généralement intimidant et stressant pour un\n"
+"utilisateur inexpérimenté. Heureusement, un assistant a été prévu à cet\n"
+"effet. Avant de commencer, lisez le reste de ce document et surtout, \n"
+"prenez votre temps.\n"
 "\n"
 "Selon la configuration de votre disque, plusieurs options sont "
 "disponibles :\n"
 "\n"
 "\n"
-" * « %s » : cette option tentera simplement de partitionner automatiquement\n"
-"l'espace inutilisé sur votre disque. Il n'y aura pas d'autre question.\n"
+" * « %s » : cette option tentera de partitionner automatiquement l'espace\n"
+"inutilisé sur votre disque. Il n'y aura pas d'autre question.\n"
 "\n"
 " * « %s » : l'assistant a détecté une ou plusieurs partitions Linux\n"
-"existant sur votre disque. Si vous voulez les utiliser, choisissez cette\n"
+"existantes sur votre disque. Si vous voulez les utiliser, choisissez cette\n"
 "option. Il vous sera alors demandé de choisir les points de montage\n"
 "associés à chacune des partitions. Les anciens points de montage sont\n"
 "sélectionnés par défaut, et vous devriez généralement les garder.\n"
 "\n"
 " * « %s » : si Microsoft Windows est installé sur votre disque et en prend\n"
-"toute la place vous devez faire de la place pour votre installation\n"
+"toute la place, vous devez faire de la place pour votre installation\n"
 "GNU/Linux. Pour ce faire, vous pouvez tout effacer (voir « effacer tout le\n"
 "disque ») ou vous pouvez redimensionner la partition Windows FAT ou NTFS.\n"
 "Le redimensionnement peut être effectué sans pertes de données, à condition\n"
@@ -886,19 +897,20 @@ msgstr ""
 " * « %s » : si vous voulez effacer toutes les données et les applications\n"
 "installées sur votre système et les remplacer par votre nouveau système\n"
 "Mageia, choisissez cette option. Soyez prudent, car ce choix est\n"
-"irréversible et permanent. Il vous sera impossible de retrouver vos données\n"
-"effacées.\n"
+"irréversible et permanent une fois confirmé. Il vous sera impossible de\n"
+"retrouver vos données effacées.\n"
 "\n"
 "   !! En choisissant cette option, l'ensemble du contenu de votre disque\n"
 "sera détruit. !!\n"
 "\n"
-" * « %s » : ce choix apparaît lorsque l'intégralité du disque dur est occupé\n"
+" * « %s » : ce choix apparaît lorsque l'intégralité du disque dur est "
+"occupé\n"
 "par Microsoft Windows. Choisir cette option effacera tout simplement ce que\n"
 "contient le disque et recommencera à zéro. Toutes les données et les\n"
 "programmes présents sur le disque seront effacés.\n"
 "\n"
 "   !! En choisissant cette option, l'ensemble de votre disque sera effacé\n"
-"!!\n"
+"et les données perdues. !!\n"
 "\n"
 " * « %s » : permet de partitionner manuellement votre disque. Soyez\n"
 "prudent, car bien que plus puissante, cette option est dangereuse. Vous\n"
@@ -1014,7 +1026,7 @@ msgid "Save packages selection"
 msgstr "Sauvegarder la sélection des paquetages"
 
 #: ../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"
@@ -1061,7 +1073,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../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"
@@ -1089,7 +1101,7 @@ msgstr ""
 "à jour sélectionnées, ou « %s » pour abandonner."
 
 #: ../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"
@@ -1113,7 +1125,7 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quel niveau choisir, gardez la sélection par défaut.\n"
 "Vous pourrez le modifier ultérieurement avec l'outil draksec, qui se trouve\n"
-"dans le Centre de Contrôle Mageia\n"
+"dans le Centre de Contrôle Mageia.\n"
 "\n"
 "Remplissez le champ « %s » avec l'adresse électronique de l'utilisateur qui\n"
 "sera responsable de la sécurité. Les messages de sécurité lui seront\n"
@@ -1125,24 +1137,27 @@ msgid "Security Administrator"
 msgstr "Administrateur sécurité"
 
 #: ../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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1158,21 +1173,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1189,20 +1206,14 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "À cette étape, vous devez sélectionner quelle partition sera utilisée pour\n"
-"votre système Mageia. Si votre disque est déjà partitionné, soit "
-"par\n"
+"votre système Mageia. Si votre disque est déjà partitionné, soit par\n"
 "une autre installation GNU/Linux ou par un autre outil de partitionnement,\n"
-"vous pourrez les utiliser. Sinon, les partitions devront être créées.\n"
+"vous pourrez utiliser les partitions existantes. Sinon, elles devront être "
+"créées.\n"
 "\n"
 "Pour créer une partition, vous devez d'abord sélectionner le disque à\n"
 "utiliser. Vous pouvez le sélectionner en cliquant sur « hda » pour le\n"
@@ -1213,16 +1224,16 @@ msgstr ""
 "options suivantes :\n"
 "\n"
 " * « %s » : cette option effacera toutes les partitions sur le disque\n"
-"sélectionné;\n"
+"sélectionné ;\n"
 "\n"
-" * « %s » : cette option permet de créer un système de ficher ext3 et\n"
-"« Swap » dans l'espace libre sur votre disque;\n"
+" * « %s » : cette option permet de créer des partitions ext4 et\n"
+"« swap » dans l'espace libre sur votre disque ;\n"
 "\n"
 "« %s » : permet d'accéder à des fonctionnalités supplémentaires :\n"
 "\n"
 " * « %s » : sauvegarde la table de partition sur un disque amovible. Cette\n"
 "option s'avère particulièrement pratique pour réparer des partitions\n"
-"endommagées. Il est fortement recommandé de procéder ainsi;\n"
+"endommagées. Il est fortement recommandé de procéder ainsi ;\n"
 "\n"
 " * « %s » : permet de restaurer une table de partition sauvegardée au\n"
 "préalable sur une disquette.\n"
@@ -1231,21 +1242,23 @@ msgstr ""
 "de la récupérer avec ces options. Soyez prudent et sachez que cela ne\n"
 "fonctionne pas à coup sûr.\n"
 "\n"
-" * « %s » : écarte les changements et charge la table de partition initiale;\n"
+" * « %s » : annule les changements et charge la table de partition "
+"initiale ;\n"
 "\n"
 " * « %s » : en cochant cette case, les CD-ROM et disquettes (et autres\n"
-"supports) seront chargés automatiquement.\n"
+"supports amovibles) seront chargés automatiquement.\n"
 "\n"
 " * « %s » : utilisez cette option si vous souhaitez utiliser un assistant\n"
 "pour partitionner votre disque. Cette option est particulièrement\n"
 "recommandée si vous faites vos premiers pas avec les partitions.\n"
 "\n"
-" * « %s » : utilisez cette option pour annuler vos changements;\n"
+" * « %s » : utilisez cette option pour annuler vos changements ;\n"
 "\n"
 " * « %s » : permet des actions supplémentaires sur les partitions (type,\n"
-"options, format) et donne plus d'informations;\n"
+"options, format) et donne plus d'informationssur le disque ;\n"
 "\n"
-" * « %s » : une fois le partitionnement terminé, ce bouton vous permettra de\n"
+" * « %s » : une fois le partitionnement terminé, ce bouton vous permettra "
+"de\n"
 "sauvegarder vos changements sur le disque.\n"
 "\n"
 "Lorsque vous définissez la taille d'une partition, vous pouvez choisir\n"
@@ -1253,25 +1266,21 @@ msgstr ""
 "clavier.\n"
 "\n"
 "Note : vous pouvez atteindre toutes les options en utilisant le clavier.\n"
-"Naviguer avec les flèches et [Tab].\n"
+"Naviguer avec les flèches [haut/bas] et [Tab].\n"
 "\n"
 "Une fois la partition sélectionnée, vous pouvez utiliser :\n"
 "\n"
 " * Ctrl-c pour créer un nouvelle partition (lorsqu'une partition vide est\n"
-"sélectionnée;\n"
+"sélectionnée ;\n"
 "\n"
-" * Ctrl-d pour effacer une partition;\n"
+" * Ctrl-d pour effacer une partition ;\n"
 "\n"
-" * Ctrl-m pour définir le « mount point »\n"
+" * Ctrl-m pour définir le « point de montage »\n"
 "\n"
-"Pour obtenir plus d'information sur les systèmes de fichiers, veuillez lire\n"
-"sur le système de fichier ext2FS dans « Manuel de Référence ».\n"
-"\n"
-"Si vous installez sur un poste PPC, vous devrez créer une petite partition\n"
-"HFS « bootstrap » d'au moins 1 Mo qui sera utilisée par le chargeur de\n"
-"démarrage (« bootloader ») yaboot. Si vous optez pour une partition plus\n"
-"grande, disons 50Mo, vous trouverez utile d'y placer des noyaux et des\n"
-"images « ramdisk » accessibles en cas de problème."
+"Pour obtenir plus d'informations sur les systèmes de fichiers, veuillez "
+"lire\n"
+"le chapitre sur le système de fichier ext2FS dans le « Manuel de\n"
+"Référence ».\n"
 
 #: ../help.pm:526
 #, c-format
@@ -1311,69 +1320,77 @@ msgstr "Basculer entre les modes expert et normal"
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../help.pm:536
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Plus d'une partition Windows a été détectée sur votre disque dur. Veuillez\n"
-"choisir celle que vous choisissez pour votre nouvelle installation de\n"
-"Mageia.\n"
+"choisir celle que vous voulez redimensionner pour votre nouvelle "
+"installation\n"
+"de Mageia.\n"
 "\n"
-"Chaque partition est identifiée comme suit : « Nom Linux », « Nom Windows »,\n"
+"Chaque partition est identifiée comme suit : « Nom Linux », « Nom "
+"Windows »,\n"
 "« Capacité ».\n"
 "\n"
-"Le « Nom » est structuré ainsi : « type de disque dur », « numéro du disque\n"
-"dur », « numéro de partition ». Par exemple, « hda1 ».\n"
+"Le « Nom Linux » est structuré ainsi : « type de disque dur », « numéro du\n"
+"disque dur », « numéro de partition ». Par exemple, « hda1 ».\n"
 "\n"
 "Le « Type de disque dur » correspond à « hd » si votre disque est IDE. Pour "
 "un\n"
-"disque SCSI, vous lirez « sd ».\n"
+"disque SCSI, vous aurez « sd ».\n"
 "\n"
-"Le numéro du disque est toujours listé après le « hd » ou « fd ». Pour les\n"
+"Le numéro du disque est toujours listé après le « hd » ou « sd ». Pour les\n"
 "disques IDE :\n"
 "\n"
-" * « a » signifie « disque primaire maître sur le premier contrôleur IDE »;\n"
+" * « a » signifie « disque maître sur le premier contrôleur IDE »;\n"
 "\n"
-" * « b » signifie « disque primaire esclave sur le premier contrôleur\n"
+" * « b » signifie « disque esclave sur le premier contrôleur\n"
 "IDE »;\n"
 "\n"
-" * « c » indique « disque primaire maître sur le second contrôleur IDE »;\n"
+" * « c » indique « disque maître sur le second contrôleur IDE »;\n"
 "\n"
-" * « d » signifie « disque primaire esclave sur le second contrôleur IDE »;\n"
+" * « d » signifie « disque esclave sur le second contrôleur IDE »;\n"
 "\n"
-"Avec les disques SCSI, le « a » indique le plus petit SCSI ID, et ainsi de\n"
+"Avec les disques SCSI, le « a » indique le plus petit ID SCSI, et ainsi de\n"
 "suite.\n"
 "\n"
-"« Nom Windows » c'est la lettre assignée à votre disque, (le premier\n"
-"disque ou partition « C: »)"
+"Le « Nom Windows » est la lettre assignée à votre disque sous\n"
+"Windows (le premier disque ou partition est appelé « C: »)."
 
 #: ../help.pm:567
 #, c-format
@@ -1391,7 +1408,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../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"
@@ -1402,8 +1419,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1434,8 +1452,7 @@ msgstr ""
 "sont accessibles.\n"
 "\n"
 "La mise à jour devrait fonctionner correctement pour les systèmes\n"
-"Mageia à partir de la version « 8.1 ». Essayer de lancer une mise à\n"
-"jour sur les versions antérieures à « 8.1 » n'est pas recommandé."
+"Mageia à partir de la version « 2 »."
 
 #: ../help.pm:594
 #, c-format
@@ -1478,7 +1495,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../help.pm:612
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1531,24 +1548,24 @@ msgstr ""
 "choisissant des langues supplémentaires, le programme vous installera toute\n"
 "la documentation et les applications nécessaires à l'utilisation de ces\n"
 "langues. Par exemple, si vous prévoyez d'accueillir des utilisateurs\n"
-"d'Espagne sur votre machine, choisissez le français comme langue principale\n"
+"espagnols sur votre machine, choisissez le français comme langue principale\n"
 "dans l'arborescence, et « %s », dans la section avancée.\n"
 "\n"
 "À propos de l'encodage UTF-8 (unicode) : Unicode est un nouveau système\n"
-"d'encodage des caractères censé couvrir tous les langues existantes.\n"
+"d'encodage des caractères censé couvrir toutes les langues existantes.\n"
 "Cependant son intégration dans GNU/Linux est encore imparfaite. Pour cette\n"
 "raison, Mageia l'utilisera ou non selon les critères suivants :\n"
 "\n"
 " * Si vous choisissez une langue avec un encodage ayant une longue histoire\n"
 "(langues associées à « latin1 », Russe, Japonais, Chinois, Coréen, Thaï,\n"
 "Grec, Turc, et la plupart des langues « iso-8859-2 »), l'encodage\n"
-"historique sera utilisé;\n"
+"historique sera utilisé ;\n"
 "\n"
-" * Les autres langues entraîneront l'utilisation d'unicode par défaut;\n"
+" * Les autres langues entraîneront l'utilisation d'unicode par défaut ;\n"
 "\n"
 " * Si vous demandez l'installation de plus d'une langue, et que ces langues\n"
 "n'utilisent pas le même encodage, alors unicode sera utilisé pour tout le\n"
-"système;\n"
+"système ;\n"
 "\n"
 " * Enfin, unicode peut aussi être utilisé quelque soit votre configuration\n"
 "des langues à utiliser, en sélectionnant l'option « %s ».\n"
@@ -1561,7 +1578,7 @@ msgstr ""
 "Pour passer d'une langue à l'autre, vous pouvez lancer l'utilitaire\n"
 "« /usr/sbin/localedrake » en tant que « root » pour changer la langue\n"
 "utilisée dans tout le système ; connectez-vous en simple utilisateur pour\n"
-"ne changer que la langue de cet utilisateur."
+"changer la langue uniquement pour cet utilisateur."
 
 #: ../help.pm:650
 #, c-format
@@ -1678,7 +1695,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1703,7 +1720,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../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"
@@ -1730,37 +1747,36 @@ msgid ""
 "system you may change it by running PrinterDrake from the Mageia\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
-"Maintenant, il faut choisir un système d'impression pour votre ordinateur. "
-"D'autres\n"
-"systèmes d'exploitation en offrent un, mais Mageia en propose deux. "
-"Chaque système\n"
-"d'impression convient le mieux à un type différent de configuration.\n"
+"Maintenant, il faut choisir un système d'impression pour votre ordinateur.\n"
+"D'autres systèmes d'exploitation en offrent un, mais Mageia en propose\n"
+"deux. Chaque système d'impression convient mieux à un type différent\n"
+"de configuration.\n"
 "\n"
 " * « %s » - qui veut dire « print, do not queue », (ou, impression sans\n"
 "passer par la file d'attente) est un bon choix si votre imprimante est\n"
 "branchée directement sur votre poste, que vous voulez pouvoir arrêter\n"
 "l'impression directement en cas de problème et que vous n'avez pas\n"
-"d'imprimante réseau. « %s » prendra en charge des configurations simples en "
-"réseau, mais\n"
-"les performances sont plutôt mauvaises dans ces cas. Choisissez «pdq» si "
-"vous\n"
-"débutez sous GNU/Linux.\n"
+"d'imprimante réseau. « %s » prendra en charge des configurations simples\n"
+"en réseau, mais les performances sont plutôt mauvaises dans ces cas.\n"
+"Choisissez « pdq » si vous débutez sous GNU/Linux.\n"
 "\n"
 " * « %s » - « Common Unix Printing System », est fabuleux autant pour une\n"
 "imprimante locale que pour imprimer à l'autre bout du monde. C'est simple\n"
-"et il peut agir comme un serveur ou un client avec l'ancien système "
-"d'impression « lpd », de ce fait il est compatible avec les anciens\n"
-" systèmes d'exploitations qui nécessitent encore un service d'impression. Il "
-"s'agit d'un outil très puissant et les\n"
-"configurations de base sont aussi simples que « pdq ». Pour émuler un serveur "
-"« lpd », lancez le démon (« daemon ») « cups-lpq ». « %s » qui offre une "
-"interface graphique simple pour imprimer sur et administrer les "
-"imprimantes.\n"
-"\n"
-"Si vous choisissez votre système d'impression maintenant et que par la suite "
-"vous n'en êtes pas content, vous pourrez le changer\n"
-"ultérieurement en lançant PrinterDrake depuis le Centre de contrôle\n"
-"Mageia en cliquant sur le bouton « %s »."
+"à configurer et il peut agir comme un serveur ou un client avec l'ancien\n"
+"système d'impression « lpd ». De ce fait il est compatible avec les anciens\n"
+" systèmes d'exploitations qui nécessitent encore un service d'impression. "
+"Il\n"
+"s'agit d'un outil très puissant et les configurations de base sont aussi "
+"simples\n"
+"que « pdq ». Pour émuler un serveur « lpd », lancez le démon (« daemon »)\n"
+"« cups-lpq ». « %s » offre une interface graphique simple pour imprimer,\n"
+"choisir les options d'impression et administrer les imprimantes.\n"
+"\n"
+"Si vous choisissez votre système d'impression maintenant et que par la "
+"suite\n"
+"vous n'en êtes pas content, vous pourrez le changer ultérieurement en\n"
+"lançant PrinterDrake depuis le Centre de contrôle Mageia en cliquant sur le\n"
+"bouton « %s »."
 
 #: ../help.pm:768
 #, c-format
@@ -1787,7 +1803,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1832,7 +1848,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../help.pm:794
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "As a review, DrakX will present a summary of information it has gathered\n"
 "about your system. Depending on the hardware installed on your machine, you\n"
@@ -1908,7 +1924,7 @@ msgstr ""
 "ne se trouve pas dans la première liste, cliquez sur « %s » pour avoir la\n"
 "liste complète.\n"
 "\n"
-" * « %s » : DrakX, par défaut, configure le fuseau horaire selon le pays\n"
+" * « %s » : par défaut, DrakX configure le fuseau horaire selon le pays\n"
 "dans lequel vous vous trouvez. Cliquez sur le bouton « %s » si ce n'est pas\n"
 "le bon.\n"
 "\n"
@@ -1925,8 +1941,8 @@ msgstr ""
 "détectée, cliquez sur « %s » pour la configurer à la main.\n"
 "\n"
 " * « %s » : si une carte RNIS (ISDN) est détectée, elle apparaîtra ici.\n"
-"Vous pouvez cliquer sur le bouton « %s » pour en modifier les paramètres si\n"
-"vous estimez que la configuration actuelle est inexacte.\n"
+"Vous pouvez cliquer sur le bouton « %s » pour en modifier les paramètres\n"
+"si vous estimez que la configuration actuelle est inexacte.\n"
 "\n"
 " * « %s » : par défaut, DrakX configure votre interface graphique avec une\n"
 "résolution de « 800x600 » ou « 1024x768 ». Si cela ne vous convient pas,\n"
@@ -1935,12 +1951,11 @@ msgstr ""
 "\n"
 " * « %s » : si vous souhaitez configurer votre accès Internet ou réseau\n"
 "local dès maintenant. Lisez la documentation fournie ou exécutez\n"
-"le Centre de Contrôle Mageia après l'installation pour avoir droit à "
-"une\n"
+"le Centre de Contrôle Mageia après l'installation pour avoir droit à une\n"
 "aide complète en ligne.\n"
 "\n"
 " * « %s » : permet de configurer les adresses proxy HTTP et FTP si la\n"
-"machine que vous installez se trouve derrière un serveur proxy.\n"
+"machine que vous installez se trouve derrière un serveur mandataire.\n"
 "\n"
 " * « %s » : il vous est ici proposé de redéfinir votre niveau de sécurité\n"
 "tel que défini dans une étape précédente ().\n"
@@ -1977,15 +1992,15 @@ msgstr "Interface graphique"
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../help.pm:861
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
-"Choisissez le disque dur à effacer pour installer votre partition\n"
-"GNU/Linux. Soyez prudent, toute l'information stockée sur le disque sera\n"
-"détruite."
+"Choisissez le disque dur à effacer pour installer votre nouvelle partition\n"
+"Mageia. Soyez prudent, toute les informations stockées sur le disque\n"
+"seront détruites."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
@@ -1993,12 +2008,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Cliquez sur « %s » si vous voulez vraiment effacer toute l'information et\n"
 "les partitions. Soyez prudent, après avoir cliqué sur « %s », vous ne\n"
diff --git a/perl-install/install/help/po/fur.po b/perl-install/install/help/po/fur.po
index 258aac8a3..6ea574419 100644
--- a/perl-install/install/help/po/fur.po
+++ b/perl-install/install/help/po/fur.po
@@ -84,7 +84,7 @@ msgstr "Vuelistu doprâ cheste fature?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -94,24 +94,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -408,31 +408,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -448,14 +448,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -612,19 +612,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -640,21 +640,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -671,14 +671,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -719,34 +713,34 @@ msgstr ""
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -771,8 +765,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -927,7 +921,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -986,7 +980,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1090,7 +1084,7 @@ msgstr ""
 #: ../help.pm:861
 #, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1099,12 +1093,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 
 #: ../help.pm:872
diff --git a/perl-install/install/help/po/ga.po b/perl-install/install/help/po/ga.po
index d15ab55ab..213cd0a2c 100644
--- a/perl-install/install/help/po/ga.po
+++ b/perl-install/install/help/po/ga.po
@@ -81,7 +81,7 @@ msgstr "An mian leat an gné seo a úsáid?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -91,24 +91,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -405,31 +405,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -445,14 +445,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -609,19 +609,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -637,21 +637,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -668,14 +668,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -716,34 +710,34 @@ msgstr ""
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -768,8 +762,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -924,7 +918,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -983,7 +977,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1087,7 +1081,7 @@ msgstr "Comhéadan Grafach"
 #: ../help.pm:861
 #, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1096,12 +1090,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 
 #: ../help.pm:872
diff --git a/perl-install/install/help/po/gl.po b/perl-install/install/help/po/gl.po
index cf6a6b369..7354ed534 100644
--- a/perl-install/install/help/po/gl.po
+++ b/perl-install/install/help/po/gl.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2006-07-08 20:57+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team:  <gl@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -127,7 +128,8 @@ msgstr "Desexa usar esta funcionalidade?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -137,24 +139,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "As particións listadas aquí son as particións Linux existentes detectadas\n"
@@ -689,31 +695,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -729,14 +739,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1039,19 +1050,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1067,21 +1081,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1098,14 +1114,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Neste punto cómpre que escolla que partición(s) se van usar para a\n"
 "instalación do seu sistema Mageia. Se as particións xa se\n"
@@ -1124,7 +1134,7 @@ msgstr ""
 "seleccionado\n"
 "\n"
 " * \"%s\": esta opción permítelle crear automáticamente particións\n"
-"ext3 e swap no espacio baleiro do disco duro\n"
+"ext4 e swap no espacio baleiro do disco duro\n"
 "\n"
 "\"%s\": dálle acceso a funcionalidades adicionais:\n"
 "\n"
@@ -1174,13 +1184,6 @@ msgstr ""
 "\n"
 "Para obter información sobre os diferentes tipos de sistemas de ficheiros\n"
 "dispoñibles, lea o capítulo sobre ext2FS do ``Manual de Referencia''.\n"
-"\n"
-"Se está instalando nunha máquina PPC, quererá crear unha pequena\n"
-"partición HFS para ``bootstrap'' de como mínimo 1MB a cal vai ser usada\n"
-"polo cargador de arrinque yaboot. Se opta por facer a partición un pouco\n"
-"máis grande, digamos de 50MB, podería darse conta de que é un sitio útil\n"
-"para almacenar un kernel de reserva e imaxes ramdisk para situacións de\n"
-"arrinques de emerxencia."
 
 #: ../help.pm:526
 #, c-format
@@ -1220,34 +1223,40 @@ msgstr "Cambiar entre modo normal/experto"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Detectouse máis dunha partición Microsoft no seu disco duro. Elixa a que\n"
@@ -1304,8 +1313,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1577,7 +1587,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1679,7 +1689,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1872,7 +1882,7 @@ msgstr "Interface Gráfica"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1884,12 +1894,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Prema en \"%s\" se desexa eliminar tódolos datos e particións presentes\n"
 "neste disco duro. Teña tino, despois de premer en \"%s\", non poderá\n"
diff --git a/perl-install/install/help/po/he.po b/perl-install/install/help/po/he.po
index c416f83f6..4bea8e723 100644
--- a/perl-install/install/help/po/he.po
+++ b/perl-install/install/help/po/he.po
@@ -18,6 +18,7 @@ msgstr ""
 "PO-Revision-Date: 2008-02-01 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: Hebrew <he@li.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,8 @@ msgstr "ה�� להפעיל �פשרות זו?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -143,24 +145,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "להלן רשומות מחיצות הלינוקס שזוהו בכונן הקשיח שלך. \n"
@@ -684,31 +690,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -724,14 +734,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1026,19 +1037,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1054,21 +1068,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1085,14 +1101,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "בשלב זה, עליך לבחור היכן תותקן מערכת מנדריבה לינוקס בכונן הקשיח\n"
 "שלך. �� כבר הוגדרו מחיצותמת�ימות, בין �� על ידי התקנה קודמת\n"
@@ -1109,7 +1119,7 @@ msgstr ""
 "\n"
 " * \"%s\": �פשרות זו תמחק �ת כל המחיצות המוגדרות בכונן הקשיח\n"
 "\n"
-" * \"%s\": �פשרות זו מ�פשרת לך ליצור ב�ופן �וטומטי מחיצתext3\n"
+" * \"%s\": �פשרות זו מ�פשרת לך ליצור ב�ופן �וטומטי מחיצתext4\n"
 "ומחיצת החלפה בשטח הפנוי של הכונן הקשיח שלך\n"
 "\n"
 "\"%s\": מ�פשר לך לבחור ב�פשרויות נוספות:\n"
@@ -1202,34 +1212,40 @@ msgstr "מעבר בין מצבי רגיל\"מומחה "
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "יותר ממחיצה �חת של מיקרוסופט זוהתה בכונן הקשיח שלך.\n"
@@ -1284,8 +1300,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1415,8 +1432,8 @@ msgstr ""
 "של מנדריבה-לינוקס ב-UTF-8 יהיה תלוי בהגדרות המשתמש:\n"
 "\n"
 " * �� נבחרה שפה שהשימוש בקידוד הישן שלה נפוץ (לדוגמה שפות ע� latin1, רוסית,\n"
-"יפנית, סינית, קורי�נית, ת�ילנדית, יוונית, תורכית ורוב השפות שמשתמשות ב-iso-"
-"8859-2)\n"
+"יפנית, סינית, קורי�נית, ת�ילנדית, יוונית, תורכית ורוב השפות שמשתמשות ב-"
+"iso-8859-2)\n"
 "יעשה שימוש בקידוד הישן כברירת מחדל;\n"
 "\n"
 " * עבור שפות �חרות יעשה שימוש ביוניקוד כברירת מחדל;\n"
@@ -1530,8 +1547,8 @@ msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
 "Windows is named \"ttyS0\" under GNU/Linux."
 msgstr ""
-"נ� לבחור �ת היצי�ה הנכונה. לדוגמה, יצי�ה \"COM1\" תחת Windows תקר�, \"ttyS0"
-"\"\n"
+"נ� לבחור �ת היצי�ה הנכונה. לדוגמה, יצי�ה \"COM1\" תחת Windows תקר�, "
+"\"ttyS0\"\n"
 "תחת GNU/Linux."
 
 #: ../help.pm:684
@@ -1548,7 +1565,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1646,7 +1663,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1834,7 +1851,7 @@ msgstr "ממשק גרפי"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1846,12 +1863,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "עליך ללחוץ על %s �� ברצונך למחוק �ת כל המחיצות והמידע על כונן קשיח\n"
 "זה. זהירות: �חרי לחיצה על \"%s\" �ין דרך לשחזר �ת המחיצות והמידע\n"
diff --git a/perl-install/install/help/po/hi.po b/perl-install/install/help/po/hi.po
index 35099b54e..f44d14888 100644
--- a/perl-install/install/help/po/hi.po
+++ b/perl-install/install/help/po/hi.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2004-04-04 21:54+0530\n"
 "Last-Translator: धनञ�जय शर�मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन�दी (Hindi) <dysxhi@yahoo.co.in>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -100,8 +101,8 @@ msgstr ""
 "\n"
 "जब आप \"%s\" पर क�लिक करते है, तब आप अन�य उपयोगकर�ताओं को जोड़ सकते है। अपने मित�रों में "
 "से\n"
-"हर �क के लि�, �क उपयोगकर�ता को जोड़ें । उदाहरण हेत� अपने पिता या अपनी बहन के लि� । \"%"
-"s\"\n"
+"हर �क के लि�, �क उपयोगकर�ता को जोड़ें । उदाहरण हेत� अपने पिता या अपनी बहन के लि� । "
+"\"%s\"\n"
 "पर क�लिक करें जब आप उपयोगकर�ताओं का जोड़ना समाप�त कर लें ।\n"
 "\n"
 "\"%s\" बटन पर क�लिक करके आप डिफ़ाल�ट \"shell\" को उस उपयोगकर�ता के लि�\n"
@@ -132,7 +133,8 @@ msgstr "क�या आप इस लक�षण का उपयोग कर
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -142,24 +144,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "आपकी हार�ड डिस�क पर खोजे गये विद�यमान लिनक�स विभाजनों की यह सूची है । \n"
@@ -169,8 +175,8 @@ msgstr ""
 " चयन ना करें अन�यथा आप इस पर अधिक सॉफ़�टवेयर को संसाधित नहीं कर पायेगें । यदि आप अपनी\n"
 "सूचनाओं को �क अलग विभाजन पर स�रक�षित रखने चाहते है, तो आपको �क होम \"/home\" विभाजन "
 "का \n"
-"भी निर�माण करना होगा (तभी सम�भव है यदि आपके पास �क से अधिक लिनक�स विभाजन उपलब�ध हो)"
-"।\n"
+"भी निर�माण करना होगा (तभी सम�भव है यदि आपके पास �क से अधिक लिनक�स विभाजन उपलब�ध "
+"हो)।\n"
 "\n"
 "प�रत�येक विभाजन निम�न तौर पर सूचीबद�ध है: \"नाम\", \"क�षमता\"।\n"
 "\n"
@@ -694,31 +700,35 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -734,14 +744,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -898,19 +909,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -926,21 +940,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -957,14 +973,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -1005,34 +1015,40 @@ msgstr "सामानà¥�य/विशेषजà¥�ञ विधा के मà¤
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "आपकी हार�ड डिस�क पर �क से अधिक माइक�रोसाफ़�ट विभाजनों को खोजा गया है । \n"
@@ -1090,8 +1106,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1248,7 +1265,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1323,7 +1340,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1433,7 +1450,7 @@ msgstr "सचित�र इन�टरफ़ेस"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1445,12 +1462,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "\"%s\" पर क�लिक करें, यदि आप इस हार�ड ड�राइव पर स�थित सभी सूचनाओं व विभाजनों को\n"
 "मिटाना चाहते है । सावधान रहें, \"%s\" पर क�लिक करने के उपरान�त, \n"
diff --git a/perl-install/install/help/po/hr.po b/perl-install/install/help/po/hr.po
index 911fe7085..aacd0c630 100644
--- a/perl-install/install/help/po/hr.po
+++ b/perl-install/install/help/po/hr.po
@@ -9,11 +9,12 @@ msgstr ""
 "PO-Revision-Date: 2005-01-04 21:25+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 "X-Generator: TransDict server\n"
 
 #: ../help.pm:14
@@ -123,7 +124,8 @@ msgstr "Da li želite koristiti aboot?"
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -133,24 +135,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Gore su popisane postojeće Linux particije pronađene na\n"
@@ -397,14 +403,12 @@ msgstr ""
 "grupi,\n"
 "bit ćete upitani da potvrdite da li želite stvarno instalirati te "
 "poslužitelje.\n"
-"Kod Mageiaa, svi instalirani poslužitelji se pokreću prilikom "
-"podizanja\n"
+"Kod Mageiaa, svi instalirani poslužitelji se pokreću prilikom podizanja\n"
 "sustava. ÄŒak iako su sigurni, bez poznatih problema u vrijeme izlaska "
 "distribucije,\n"
 "može se dogoditi da se otkriju sigurnosne rupe nakon zgotovljenja ove "
 "ina�ice\n"
-"Mageiaa. Ako ne znate Å¡to bi pojedini servis trebao raditi ili "
-"zašto \n"
+"Mageiaa. Ako ne znate što bi pojedini servis trebao raditi ili zašto \n"
 "se instalira, pritisnite \"Ne\". Pritiskanjem na \"Da\"instalirat će se "
 "navedeni\n"
 "servisi i pokretat će se automatski. !!\n"
@@ -645,31 +649,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -685,14 +693,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -706,8 +715,7 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "U ovom trenutku, trebate izabrati gdje ćete instalirati vaš\n"
-"Mageia operativni sustav na vašem tvrdom disku. Ukoliko je prazan "
-"ili \n"
+"Mageia operativni sustav na vašem tvrdom disku. Ukoliko je prazan ili \n"
 "ako postojeći operativni sustav koristi �itav prostor na disku, trebate ga\n"
 "particionirati. Jednostavno, particioniranje hard diska sastoji se od\n"
 "logi�kog dijeljenja kako bi napravili prostor za instalaciju vašeg novog\n"
@@ -1005,19 +1013,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1033,21 +1044,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1064,14 +1077,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "U ovoj to�ki instalacije, trebate izabrati koje partiticije ćete koristiti "
 "za\n"
@@ -1135,12 +1142,6 @@ msgstr ""
 "\n"
 "Za informacije o raznim dostupnim datote�nim sustavima, pro�itajte ext2fs\n"
 "poglavlje u ``Reference Manual''\n"
-"\n"
-"Ukoliko instalirate na PPC ra�unalo, željet ćete napraviti malu HFS\n"
-"'bootstrap' particiju od najmanje 1MB koju će koristiti\n"
-"yaboot bootloader. Ukoliko se odlu�ite za pravljenje malo veće \n"
-"particije, recimo 50MB, možete ju pronaći korisnom za stavljanje\n"
-"dodatnog kernela i ramdisk slike u slu�aju nužde."
 
 #: ../help.pm:526
 #, c-format
@@ -1180,34 +1181,40 @@ msgstr "Prebaci u normalni mod"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Više od jedne Microsoft Windows particije su pronađene\n"
@@ -1263,8 +1270,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1460,7 +1468,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1555,7 +1563,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1685,7 +1693,7 @@ msgstr "X kod pokretanja sustava"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1697,12 +1705,14 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Izaberite \"U redu\" ukoliko želite obrisati sve podatke i\n"
 "postojeće particije na navedenom tvrdom disku. Budite pažljivi, nakon\n"
diff --git a/perl-install/install/help/po/hu.po b/perl-install/install/help/po/hu.po
index cc3a8f2bb..dd53fab85 100644
--- a/perl-install/install/help/po/hu.po
+++ b/perl-install/install/help/po/hu.po
@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2006-03-05 14:45+0100\n"
 "Last-Translator: Arpad Biro\n"
 "Language-Team: Hungarian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -131,7 +132,8 @@ msgstr "Szeretné használni ezt a lehetőséget?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -141,24 +143,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Itt láthatók a lemezen talált, már létező linuxos partíciók.\n"
@@ -202,8 +208,7 @@ msgid ""
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"A Mageia telepítőanyag több CD-n helyezkedik el. Ha egy "
-"kiválasztott\n"
+"A Mageia telepítőanyag több CD-n helyezkedik el. Ha egy kiválasztott\n"
 "csomag egy másik CD-n található, akkor a telepítő kiadja az\n"
 "aktuális CD-t, és megkéri Önt, hogy helyezze be a megfelelőt.\n"
 "Ha a szóban forgó lemez nincs kéznél, akkor kattintson a(z) \"%s\" gombra,\n"
@@ -697,31 +702,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -737,14 +746,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -757,8 +767,7 @@ 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 ""
-"Ebben a lépésben kell megadni, hogy a Mageia telepítése a "
-"merevlemez\n"
+"Ebben a lépésben kell megadni, hogy a Mageia telepítése a merevlemez\n"
 "melyik részére történjen. Ha a lemez még teljesen üres, vagy a korábban\n"
 "telepített operációs rendszer(ek) miatt nincs elég szabad hely, akkor újra\n"
 "kell partícionálni a lemezt. A partícionálás a lemezterület logikai\n"
@@ -1052,19 +1061,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1080,21 +1092,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1111,14 +1125,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Ebben a lépésben kell kiválasztani a Mageia rendszer telepítéséhez\n"
 "használni kívánt partíciókat. Ha a kívánt partíciók már létre lettek hozva\n"
@@ -1236,34 +1244,40 @@ msgstr "Váltás a normál és a szakértői módok közt"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Egynél több microsoftos partíció van a lemezen.\n"
@@ -1323,8 +1337,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1598,7 +1613,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1703,7 +1718,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1892,7 +1907,7 @@ msgstr "Grafikus felület"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1904,12 +1919,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Kattintson a(z) \"%s\" gombra, ha a lemezen található összes adatot\n"
 "és partíciót törölni szeretné. Figyelem! A(z) \"%s\" gomb megnyomása\n"
diff --git a/perl-install/install/help/po/id.po b/perl-install/install/help/po/id.po
index 1b89c4031..4f1442552 100644
--- a/perl-install/install/help/po/id.po
+++ b/perl-install/install/help/po/id.po
@@ -20,6 +20,7 @@ msgstr ""
 "PO-Revision-Date: 2006-03-11 10:45+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -140,7 +141,8 @@ msgstr "Apakah Anda ingin menggunakan fitur ini?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -150,27 +152,32 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
-"Berikut adalah daftar partisi Linux yang terdeteksi pada hard drive Anda.\n"
+"Berikut adalah daftar partisi Linux yang terdeteksi pada hard disk drive "
+"Anda.\n"
 "Anda dapat memakai pilihan yg dibuatkan, karena itu baik untuk installasi\n"
 "umum. Bila Anda mengubah pilihan, setidaknya Anda perlu mendefinisikan\n"
 "partisi root (\"/\"). Jangan pilih partisi yang terlalu kecil agar dapat\n"
@@ -181,22 +188,22 @@ msgstr ""
 "\n"
 "Setiap partisi terdaftar sebagai: \"Nama\", \"Kapasitas\".\n"
 "\n"
-"\"Nama\" berstruktur: \"tipe hard drive\", \"nomor hard drive\",\n"
+"\"Nama\" berstruktur: \"tipe hard disk drive\", \"nomor hard disk drive\",\n"
 "\"nomor partisi\" (misalnya \"hda1\").\n"
 "\n"
-"\"Tipe hard drive\" adalah \"hd\" untuk drive IDE dan \"sd\" untuk drive "
-"SCSI.\n"
+"\"Tipe hard disk drive\" adalah \"hd\" untuk drive IDE dan \"sd\" untuk "
+"drive SCSI.\n"
 "\n"
 "\"Nomor Hard Drive\", selalu berupa huruf setelah \"hd\" atau \"sd\". Bila "
 "berupa IDE, maka:\n"
 "\n"
-"   *\"a\" berarti \"hard drive master pada kontroller IDE primer\",\n"
+"   *\"a\" berarti \"hard disk drive master pada kontroller IDE primer\",\n"
 "\n"
-"   *\"b\" berarti \"hard drive slave pada kontroler IDE primer\",\n"
+"   *\"b\" berarti \"hard disk drive slave pada kontroler IDE primer\",\n"
 "\n"
-"   *\"c\" berarti \"hard drive master pada kontroler IDE sekunder\",\n"
+"   *\"c\" berarti \"hard disk drive master pada kontroler IDE sekunder\",\n"
 "\n"
-"   *\"d\" berarti \"hard drive slave pada kontroler IDE sekunder\",\n"
+"   *\"d\" berarti \"hard disk drive slave pada kontroler IDE sekunder\",\n"
 "\n"
 "Pada drive SCSI, \"a\" adalah \"ID SCSI terkecil\", \"b\" adalah\"ID SCSI "
 "terkecil kedua\", dan seterusnya."
@@ -210,8 +217,8 @@ msgid ""
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Installasi Mageia didistribusikan pada beberapa CDROM. DrakX tahu "
-"jika paket\n"
+"Installasi Mageia didistribusikan pada beberapa CDROM. DrakX tahu jika "
+"paket\n"
 "terpilih berada di CDROM lain dan akan mengeluarkan CD yang ada untuk "
 "kemudian\n"
 "meminta Anda memasukkan CD yg diperlukan. Jika Anda tidak memiliki CD yang "
@@ -278,12 +285,10 @@ msgid ""
 msgstr ""
 "Sekarang waktunya untuk menentukan program yang akan diinstal. Terdapat "
 "ribuan \n"
-"pada Mageia, dan untuk mempermudah, mereka telah diletakkan pada "
-"grup \n"
+"pada Mageia, dan untuk mempermudah, mereka telah diletakkan pada grup \n"
 "aplikasi yang sejenis.\n"
 "\n"
-"Mageia mengurutkan paket dalam empat kategori. Anda bisa "
-"menggabungkan \n"
+"Mageia mengurutkan paket dalam empat kategori. Anda bisa menggabungkan \n"
 "menyesuaikan aplikasi dari berbagai kategori, sehingga installasi "
 "``Workstation''\n"
 "tetap dapat memiliki aplikasi pada installasi ``Server''\n"
@@ -402,8 +407,7 @@ msgstr ""
 "grup besar, akan ada pertanyaan konfirmasi installasi paket tersebut. Pada\n"
 "Mageia, secara default semua server terinstal dijalankan saat boot.\n"
 "Meski aman saat distribusi diluncurkan, ada kemungkinan lubang keamanan\n"
-"ditemukan setelah versi Mageia ini selesai. Jika Anda tidak tahu "
-"apa\n"
+"ditemukan setelah versi Mageia ini selesai. Jika Anda tidak tahu apa\n"
 "yang dilakukan oleh suatu layanan atau mengapa ia diinstal, klik \"%s\".\n"
 "Jika Anda menekan \"%s\" layanan terdaftar akan diinstal dan akan "
 "dijalankan\n"
@@ -733,31 +737,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -773,14 +781,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -795,8 +804,7 @@ msgid ""
 msgstr ""
 "Sekarang Anda harus menentukan dimana Anda hendak menginstall sistem "
 "operasi\n"
-"Mageia pada harddisk Anda. Jika harddisk Anda kosong atau jika "
-"sebuah\n"
+"Mageia pada harddisk Anda. Jika harddisk Anda kosong atau jika sebuah\n"
 "sistem operasi menggunakan semua tempat, Anda harus mempartisi drive.\n"
 "Pada dasarnya, mempartisi harddisk berarti membaginya secara logical\n"
 "untuk membuat ruang yang diperlukan sistem Mageia baru Anda.\n"
@@ -836,8 +844,7 @@ msgstr ""
 "dengan sebelumnya Anda sudah mendefrag partisi Windows.\n"
 "Membackup data sangat disarankan. Penggunaan opsi ini sangat "
 "direkomendasikan jika Anda\n"
-"ingin menggunakan Mageia dan Microsoft Windows pada komputer yang "
-"sama.\n"
+"ingin menggunakan Mageia dan Microsoft Windows pada komputer yang sama.\n"
 "\n"
 "   Sebelum memilih opsi ini, harap dipahami bahwa setelah prosedur ini, "
 "ukuran partisi \n"
@@ -849,8 +856,8 @@ msgstr ""
 "\n"
 " * \"%s\". Jika Anda hendak menghapus seluruh data dan semua partisi yang "
 "ada pada harddisk\n"
-"Anda dan menggantinya dengan sistem Mageia yang baru, pilih opsi "
-"ini. Hati-hati, karena\n"
+"Anda dan menggantinya dengan sistem Mageia yang baru, pilih opsi ini. Hati-"
+"hati, karena\n"
 "Anda tidak bisa membatalkan opsi ini setelah Anda mengkonfirmasikan.\n"
 "\n"
 "   !! Jika Anda memilih opsi ini, semua data pada harddisk Anda akan "
@@ -1096,19 +1103,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1124,21 +1134,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1155,14 +1167,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Saat ini, Anda harus memilih partisi yang akan digunakan untuk installasi\n"
 "sistem Mageia Anda. Jika partisi telah didefinisikan, baik dari\n"
@@ -1178,7 +1184,7 @@ msgstr ""
 "\n"
 " * \"%s\": opsi ini menghapus seluruh partisi pada drive terpilih\n"
 "\n"
-" * \"%s\": opsi ini memungkinkan Anda membuat partisi ext3 dan swap\n"
+" * \"%s\": opsi ini memungkinkan Anda membuat partisi ext4 dan swap\n"
 "secara otomatis pada ruang kosong dari hard disk Anda.\n"
 "\n"
 "\"%s\": memberi akses pada fitur tambahan:\n"
@@ -1228,11 +1234,6 @@ msgstr ""
 "\n"
 "Untuk mendapatkan informasi tentang jenis sistem file yang ada, \n"
 "silahkan membaca bab ext2FS dari ``Referensi Manual''.\n"
-"\n"
-"Jika Anda menginstall pada komputer PPC, Anda harus membuat partisi\n"
-"``bootstrap'' HFS kecil paling tidak 1 MB yang akan digunakan oleh\n"
-"bootloader yaboot. Jika Anda membuatnya lebih besar, misalkan 50MB\n"
-"Anda bisa menyimpan kernel dan citra ramdisk untuk situasi darurat."
 
 #: ../help.pm:526
 #, c-format
@@ -1272,34 +1273,40 @@ msgstr "Ubah ke modus normal/ahli"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Terdapat lebih dari satu partisi Microsoft yang terdeteksi pada harddisk\n"
@@ -1309,27 +1316,30 @@ msgstr ""
 "Tiap partisi terdaftar sebagai: \"Nama Linux\",\"Nama windows\",\"Kapasitas"
 "\".\n"
 "\n"
-"\"Nama Linux\" berstruktur: \"tipe hard drive\", \"nomor hard drive\",\n"
+"\"Nama Linux\" berstruktur: \"tipe hard disk drive\", \"nomor hard disk drive"
+"\",\n"
 "\"nomor partisi\" (misalnya \"hda1\").\n"
 "\n"
-"\"Tipe hard drive\" adalah \"hd\" bila drive bertipe IDE dan \"sd\" jika\n"
+"\"Tipe hard disk drive\" adalah \"hd\" bila drive bertipe IDE dan \"sd\" "
+"jika\n"
 "berupa drive SCSI.\n"
 "\n"
 "\"Nomor Hard Drive\", selalu berupa huruf setelah \"hd\" atau \"sd\". Jika\n"
 "berupa IDE, maka:\n"
 "\n"
-" * \"a\" berarti \"hard drive master pada kontroller IDE primer\",\n"
+" * \"a\" berarti \"hard disk drive master pada kontroller IDE primer\",\n"
 "\n"
-" * \"b\" berarti \"hard drive slave pada kontroler IDE primer\",\n"
+" * \"b\" berarti \"hard disk drive slave pada kontroler IDE primer\",\n"
 "\n"
-" * \"c\" berarti \"hard drive master pada kontroler IDE sekunder\",\n"
+" * \"c\" berarti \"hard disk drive master pada kontroler IDE sekunder\",\n"
 "\n"
-" * \"d\" berarti \"hard drive slave pada kontroler IDE sekunder\",\n"
+" * \"d\" berarti \"hard disk drive slave pada kontroler IDE sekunder\",\n"
 "\n"
 "Pada drive SCSI, \"a\" berarti \"ID SCSI terkecil, \"b\" berarti \"ID SCSI\n"
 "terkecil kedua\", dst.\n"
 "\n"
-"\"Nama windows\" adalah huruf hard drive Anda pada Windows (disk pertama\n"
+"\"Nama windows\" adalah huruf hard disk drive Anda pada Windows (disk "
+"pertama\n"
 "pada partisi disebut \"C:\")."
 
 #: ../help.pm:567
@@ -1356,8 +1366,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1619,7 +1630,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1716,7 +1727,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1907,7 +1918,7 @@ msgstr "Antarmuka Grafis"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1919,12 +1930,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Klik pada \"%s\" jika Anda ingin menghapus semua data dan partisi yang ada\n"
 "pada harddisk ini. Hati-hati, setelah mengklik \"%s\" Anda tidak dapat\n"
diff --git a/perl-install/install/help/po/is.po b/perl-install/install/help/po/is.po
index 4b9edde1c..eafd3f1a2 100644
--- a/perl-install/install/help/po/is.po
+++ b/perl-install/install/help/po/is.po
@@ -16,6 +16,7 @@ msgstr ""
 "PO-Revision-Date: 2006-03-07 18:42+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team:  <is@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -134,7 +135,8 @@ msgstr "Viltu nota þennan eiginleika?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -144,24 +146,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Hér er listi af núverandi Linux disksneiðum sem fundust á disknum.\n"
@@ -389,8 +395,7 @@ msgstr ""
 "!! Ef miðlara-pakki hefur verið valinn, annað hvort af því að þú valdir "
 "stakan\n"
 "pakka eða hann var hluti af hóp, verður þú beðinn um að staðfesta að\n"
-"þú viljir fá þessa miðlara uppsetta. Sjálfgefið mun Mageia ræsa "
-"allar\n"
+"þú viljir fá þessa miðlara uppsetta. Sjálfgefið mun Mageia ræsa allar\n"
 "uppsettar þjónustur og miðlara við kerfisræsingu. Jafnvel þó að þeir séu\n"
 "öruggir og engar þekktar villur þegar kerfinu var dreift þá er möguleiki að\n"
 "öryggisholur hafi uppgötvast eftir að gengið var frá þessari útgáfu af\n"
@@ -696,31 +701,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -736,14 +745,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1039,19 +1049,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1067,21 +1080,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1098,14 +1113,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Hér þarft þú að ákveða hvaða disksneið þú vilt nota fyrir Mageia\n"
 "stýrikerfið. Ef disksneiðar hafa þegar verið skilgreindar, annað hvort\n"
@@ -1122,7 +1131,7 @@ msgstr ""
 "\n"
 " * \"%s\": þessi valkostur eyðir öllum disksneiðum á disknum\n"
 "\n"
-" * \"%s\": þessi valkostur býr sjálfkrafa til ext3 og diskminnis-sneið\n"
+" * \"%s\": þessi valkostur býr sjálfkrafa til ext4 og diskminnis-sneið\n"
 "á lausu plássi á disknum.\n"
 "\n"
 "\"%s\": gefur þér aðgang að aukavalkostum:\n"
@@ -1171,12 +1180,6 @@ msgstr ""
 "\n"
 "Til að fá upplýsingar um mismunandi skráakerfi, vinsamlega lestu\n"
 "kaflann um ext2FS í ``Reference Manual''.\n"
-"\n"
-"Ef þú ert að setja upp á PPC  tölvu, þá ættir þú að búa til litla HFS\n"
-"``ræsi-disksneið'' sem er að minnsta kosti 1M. Þessi disksneið\n"
-"verður notuð af yaboot ræsistjóranum. Ef þú gerir disksneiðina\n"
-"svolítið stærri t.d. 50MB þá er það góður staður til að geyma auka\n"
-"kjarna og ræsidisk-ímyndir fyrir óvæntar uppákomur."
 
 #: ../help.pm:526
 #, c-format
@@ -1217,34 +1220,40 @@ msgstr "Víxla milli venjulegs/sérfræðings-hams"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Fleiri en ein Microsoft disksneið hefur fundist á disknum.\n"
@@ -1301,8 +1310,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1568,7 +1578,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1668,7 +1678,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1850,7 +1860,7 @@ msgstr "Myndrænt viðmót"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1862,12 +1872,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Smelltu á \"%s\" ef þú vilt eyða öllum gögnum og disksneiðum\n"
 "á þessum disk. Varúð! Eftir að þú hefur smellt á \"%s\", getur\n"
diff --git a/perl-install/install/help/po/it.po b/perl-install/install/help/po/it.po
index a50b7afb6..3d1c9fd98 100644
--- a/perl-install/install/help/po/it.po
+++ b/perl-install/install/help/po/it.po
@@ -17,6 +17,7 @@ msgstr ""
 "PO-Revision-Date: 2006-02-03 21:33+0100\n"
 "Last-Translator: Andrea Celli <a.celli@caltanet.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -136,7 +137,8 @@ msgstr "Vuoi sfruttare questa possibilità?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -146,24 +148,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "In alto puoi vedere l'elenco delle partizioni Linux individuate sul\n"
@@ -738,31 +744,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -778,14 +788,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1109,19 +1120,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1137,21 +1151,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1168,14 +1184,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "A questo punto, dovete decidere quali partizioni devono essere usate per\n"
 "l'installazione del vostro sistema Mageia. Se sono già state\n"
@@ -1195,7 +1205,7 @@ msgstr ""
 " * \"%s\": questa opzione cancella tutte le partizioni presenti sul disco\n"
 "selezionato.\n"
 "\n"
-" * \"%s\": vi permette di creare automaticamente partizioni ext3 e di swap\n"
+" * \"%s\": vi permette di creare automaticamente partizioni ext4 e di swap\n"
 "nello spazio libero presente sul vostro disco rigido.\n"
 "\n"
 "\"%s\": permette di accedere a ulteriori funzionalità:\n"
@@ -1249,13 +1259,6 @@ msgstr ""
 "\n"
 "Per ulteriori informazioni in merito ai diversi tipi di filesystem\n"
 "disponibili, consultate il capitolo ext2FS del ''Manuale di riferimento''.\n"
-"\n"
-"Se state effettuando l'installazione su una macchina PPC, sarà meglio\n"
-"creare una piccola partizione HFS di ''bootstrap'' di almeno 1 MB, che\n"
-"verrà utilizzata dal bootloader yaboot. Se decidete di creare una\n"
-"partizione più grande, diciamo sui 50 MB, essa potrebbe rappresentare un\n"
-"utile deposito in cui conservare un kernel di riserva e immagini di avvio\n"
-"da utilizzare in caso di emergenza."
 
 #: ../help.pm:526
 #, c-format
@@ -1297,34 +1300,40 @@ msgstr "Scambio tra modo normale e esperto"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Sul vostro disco rigido è stata individuata più di una partizione\n"
@@ -1386,8 +1395,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1675,7 +1685,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1731,8 +1741,7 @@ msgid ""
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Qui potrete scegliere il sistema di stampa da usare con il vostro computer;\n"
-"altri sistemi operativi ve ne offrono uno, ma Mageia ve ne offre "
-"ben\n"
+"altri sistemi operativi ve ne offrono uno, ma Mageia ve ne offre ben\n"
 "due. Ciascuno di essi è adatto a un particolare tipo di configurazione.\n"
 "\n"
 " * \"%s\" -- che sta per \"\"print, do not queue\"\" (\"stampa, non mettere\n"
@@ -1783,7 +1792,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1989,7 +1998,7 @@ msgstr "Interfaccia grafica"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -2003,12 +2012,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Clicca sul pulsante \"%s\" se vuoi cancellare tutte le partizioni e\n"
 "i dati presenti su questo disco rigido. Stai attento, dopo aver\n"
diff --git a/perl-install/install/help/po/ja.po b/perl-install/install/help/po/ja.po
index 520cf6fd8..765b07786 100644
--- a/perl-install/install/help/po/ja.po
+++ b/perl-install/install/help/po/ja.po
@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2007-03-03 08:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -123,7 +124,8 @@ msgstr "��機能を使����？"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -133,24 +135,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "�ードドライブ内�検出��既存� Linux パーティション�リスト��。\n"
@@ -659,31 +665,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -699,14 +709,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -990,19 +1001,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1018,21 +1032,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1049,14 +1065,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "���� Mageia をインストール�るパーティションを����。\n"
 "以��インストール�� GNU/Linux システム�残����り�別�ツールを\n"
@@ -1072,7 +1082,7 @@ msgstr ""
 "\n"
 " * %s: �択��ドライブ�����パーティションを削除�る\n"
 "\n"
-" * %s: �ードドライブ�空�領域�自動的� ext3 � swap を\n"
+" * %s: �ードドライブ�空�領域�自動的� ext4 � swap を\n"
 "作��る\n"
 "\n"
 "%s: ���ら拡張機能を利用����:\n"
@@ -1122,11 +1132,6 @@ msgstr ""
 "\n"
 "使用�能�他�ファイルシステム������Reference Manual �\n"
 "'ext2FS' �章を�読�����。\n"
-"\n"
-"PPC マシン�インストール�る場��最低 1 MB � HFS bootstrap \n"
-"パーティションを作�������。yaboot ブートローダ�使用���。\n"
-"��パーティションをも�少�大������� (例�� 50 MB �ら�)�\n"
-"スペアカー�ルや緊急ブート用� ramdisk イメージを�存�る��利用����。"
 
 #: ../help.pm:526
 #, c-format
@@ -1166,34 +1171,40 @@ msgstr "標準/エキスパートモード�切り替�"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "�ードドライブ� Microsoft �パーティション�����検出�れ���。\n"
@@ -1250,8 +1261,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1265,8 +1277,7 @@ msgstr ""
 "��ステップ�既存� GNU/Linux パーティション�検出�れ������表示\n"
 "�れ��。\n"
 "\n"
-"DrakX �既存� Mageia システムを更新�る��れ�も新��インストー"
-"ル\n"
+"DrakX �既存� Mageia システムを更新�る��れ�も新��インストール\n"
 "�る�を尋���:\n"
 "\n"
 " * %s: 基本的����システムを完全�消去�������。\n"
@@ -1498,7 +1509,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1593,7 +1604,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1776,7 +1787,7 @@ msgstr "グラフィカルインターフェース"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1788,12 +1799,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "���ードドライブ�����データ�パーティションを削除�る場��\n"
 "「%s�をクリック������。\n"
diff --git a/perl-install/install/help/po/ko.po b/perl-install/install/help/po/ko.po
index 9c768e712..b1aa3c2ff 100644
--- a/perl-install/install/help/po/ko.po
+++ b/perl-install/install/help/po/ko.po
@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2002-09-09 09:08+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <beadaron@hanafos.com>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -89,7 +90,8 @@ msgstr "aboot를 사용하시겠습니까?"
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -99,24 +101,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "선�� 하드디스��� 기존 리눅스 파티션� 위� 열거�어 있습니다.\n"
@@ -508,31 +514,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -548,14 +558,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -846,19 +857,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -874,21 +888,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -905,14 +921,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "�제 어� 파티션� 맨드리바 리눅스� 설치용으로 사용�어야 할지를\n"
 "선�해야 합니다. �전� 다른 GNU/리눅스를 설치한 �� 있거나, 다른 파티션\n"
@@ -965,13 +975,6 @@ msgstr ""
 "  ○ 「Ctrl + d�: 파티션 삭제하기.\n"
 "\n"
 "  ○ 「Ctrl + m�: 마운트 위치 지정하기.\n"
-"\n"
-"만약 PPC 컴퓨터�서 설치하고 있는 중��면, YABOOT 부트로�가 사용할 최소 "
-"1MB\n"
-"� HFS 「부트스트랩�파티션� 만들 필요가 있습니다. 만약 그 파티션� 보다 �"
-"게\n"
-"(가령, 50MB) 만들면, �급 �황시� 사용할 여분� 커�과 램디스� �미지를\n"
-"저장할 수 있는 유용한 장소가 � 것입니다."
 
 #: ../help.pm:526
 #, c-format
@@ -1011,34 +1014,40 @@ msgstr "�반 모드로 전환"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "둘 ��� MS 윈�우즈 파티션� 디스���서 발견�었습니다.\n"
@@ -1092,8 +1101,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1284,7 +1294,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1343,7 +1353,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1474,7 +1484,7 @@ msgstr "시작시 바로 X 실행"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1486,12 +1496,14 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "� 하드디스��� 모든 ��터와 파티션� 삭제하려면, 「확��� 누르세요.\n"
 "!!주�하세요!!�단 「확��� 누르게 �면, MS 윈�우즈 ��털르 �함하여 � "
diff --git a/perl-install/install/help/po/ky.po b/perl-install/install/help/po/ky.po
index fa200c7f7..6894e3281 100644
--- a/perl-install/install/help/po/ky.po
+++ b/perl-install/install/help/po/ky.po
@@ -128,7 +128,7 @@ msgstr "Мындай мүмкүнчүлүктү каалай�ызбы?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -138,24 +138,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Жогорудагы тизме �издин катуу ди�киңиздеги табылган Linux бөлүмдөрү.\n"
@@ -687,31 +687,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -727,14 +727,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1031,19 +1031,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1059,21 +1059,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1090,14 +1090,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -1138,34 +1132,34 @@ msgstr "Ð�ормалдык/Ñ�кÑ�перттик режимдерин алмашÑ
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Жогорудагы тизме �издин катуу ди�киңиздеги табылган Linux бөлүмдөрү.\n"
@@ -1221,8 +1215,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1379,7 +1373,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1438,7 +1432,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1542,7 +1536,7 @@ msgstr "Графикалык интерфей�"
 #: ../help.pm:861
 #, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1551,12 +1545,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 
 #: ../help.pm:872
diff --git a/perl-install/install/help/po/lt.po b/perl-install/install/help/po/lt.po
index fcf3a74e2..4863a095e 100644
--- a/perl-install/install/help/po/lt.po
+++ b/perl-install/install/help/po/lt.po
@@ -9,11 +9,12 @@ msgstr ""
 "PO-Revision-Date: 2000-12-23 13:50+0200\n"
 "Last-Translator: Mykolas Norvai­as <Myka@centras.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../help.pm:14
 #, c-format
@@ -83,7 +84,8 @@ msgstr "Ar nori naudoti aboot?"
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -93,24 +95,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Aukš�iau yra sąrašas Linux skirsnių, kuriuos pavyko rasti tavo\n"
@@ -460,31 +466,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -500,14 +510,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -555,8 +566,8 @@ msgstr ""
 "\n"
 "* IÅ¡valyti visÄ… diskÄ…: jei tu nori sunaikinti visus duomenis ir skirsnius, "
 "esan�ius kietajame diske, ir pakeisti juos\n"
-"  nauja Mageia sistema, gali pasirinkti šį variantą. Būk atsargus su "
-"Å¡iuo sprendimu, nes jei sutiksi,\n"
+"  nauja Mageia sistema, gali pasirinkti šį variantą. Būk atsargus su šiuo "
+"sprendimu, nes jei sutiksi,\n"
 "  nebegalėsi apsigalvoti ir sugrįžti.\n"
 "\n"
 "\n"
@@ -754,19 +765,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -782,21 +796,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -813,14 +829,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Dabar tu turi pasirinkti, kuriuos skirsnius naudoti tavo naujai Mandriva "
 "Linux \n"
@@ -932,34 +942,40 @@ msgstr "Pakeisti į normalų režimą"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Tavo kietajame diske buvo aptiktas vienas ar daugiau Microsoft Windows\n"
@@ -1026,8 +1042,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1184,7 +1201,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1243,7 +1260,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1373,7 +1390,7 @@ msgstr "X paleidžiant"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1385,12 +1402,14 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Spausk \"Gerai\", jei nori ištrinti visus duomenis ir skirsnius, esan�ius\n"
 "Å¡iame kietajame diske. BÅ«k atsargus, kai paspausi \"Gerai\", tu nebegalÄ—si\n"
diff --git a/perl-install/install/help/po/ltg.po b/perl-install/install/help/po/ltg.po
index cc48b7bda..9f7c78800 100644
--- a/perl-install/install/help/po/ltg.po
+++ b/perl-install/install/help/po/ltg.po
@@ -88,7 +88,7 @@ msgstr "Vai vēlaties izmantot aboot?"
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -98,24 +98,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Augst�k ir uzskaitītas eksistējoš�s Linux sadaļas, kas ir atrastas uz jūsu\n"
@@ -465,31 +465,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -505,14 +505,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -758,19 +758,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -786,21 +786,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -817,14 +817,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Pašlaik jums ir j�izvēlas, kur�(s) diska sadaļ�(s) instalēt Mageia\n"
 "operēt�jsistēmu. Ja sadaļas jau ir izveidotas (agr�kas GNU/Linux "
@@ -932,34 +926,34 @@ msgstr "P�rslēgt norm�laj� režīm�"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Uz jūsu ciet� diska ir atrasta vair�k nek� viena Microsoft Windows sadaļa.\n"
@@ -1016,8 +1010,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1187,7 +1181,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1246,7 +1240,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1371,7 +1365,7 @@ msgstr "X pēc startēšanas"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1383,12 +1377,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Nūspīdit \"%s\", ja gribit izdzēst vysus datus i\n"
 "sadalis, kurys atsarūn iz ituo cītuo diska. Esit uzmaneigi, piec \"%s\" "
diff --git a/perl-install/install/help/po/lv.po b/perl-install/install/help/po/lv.po
index 4b86c7a28..1e45799d9 100644
--- a/perl-install/install/help/po/lv.po
+++ b/perl-install/install/help/po/lv.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2002-09-27 17:45+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: Latvian <ll10nt@listes.murds.lv>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -90,7 +91,8 @@ msgstr "Vai vēlaties izmantot aboot?"
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -100,24 +102,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Augst�k ir uzskaitītas eksistējoš�s Linux sadaļas, kas ir atrastas uz jūsu\n"
@@ -464,31 +470,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -504,14 +514,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -557,8 +568,8 @@ msgstr ""
 "\n"
 "* Izdzēst visu disku: ja vēlaties izdzēst visus uz diska esošos datus un "
 "sadaļas un aizst�t t�s ar jaunu\n"
-"  Mageia sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, "
-"izvēloties šo risin�jumu, jo pēc\n"
+"  Mageia sistēmu, varat izvēlēties šo opciju. Esiet uzmanīgi, izvēloties šo "
+"risin�jumu, jo pēc\n"
 "  apstiprin�šanas jūs vairs nevarēsit atteikties no šīs izvēles.\n"
 "\n"
 "\n"
@@ -570,8 +581,7 @@ msgstr ""
 "vai izmainīt Microsoft\n"
 "  Windows sadaļas izmēru. Sadaļas izmēru var izmainīt bez datu zaudēšanas. "
 "Šis risin�jums ir ieteicams, ja\n"
-"  jūs sav� dator� vēlaties izmantot gan Mageia, gan Microsoft "
-"Windows.\n"
+"  jūs sav� dator� vēlaties izmantot gan Mageia, gan Microsoft Windows.\n"
 "\n"
 "\n"
 "  Pirms izvēlaties šo risin�jumu, ņemiet vēr�, ka Microsoft Windows sadaļas "
@@ -757,19 +767,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -785,21 +798,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -816,14 +831,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Pašlaik jums ir j�izvēlas, kur�(s) diska sadaļ�(s) instalēt Mageia\n"
 "operēt�jsistēmu. Ja sadaļas jau ir izveidotas (agr�kas GNU/Linux "
@@ -931,34 +940,40 @@ msgstr "P�rslēgt norm�laj� režīm�"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Uz jūsu ciet� diska ir atrasta vair�k nek� viena Microsoft Windows sadaļa.\n"
@@ -1015,8 +1030,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1186,7 +1202,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1245,7 +1261,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1370,7 +1386,7 @@ msgstr "X pēc startēšanas"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1382,12 +1398,14 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Nospiediet \"Labi\", ja vēlaties izdzēst visus datus un\n"
 "sadaļas, kas atrodas uz šī ciet� diska. Esiet uzmanīgi, pēc \"Labi\" "
diff --git a/perl-install/install/help/po/mk.po b/perl-install/install/help/po/mk.po
index cb574e984..0562b01a2 100644
--- a/perl-install/install/help/po/mk.po
+++ b/perl-install/install/help/po/mk.po
@@ -138,7 +138,7 @@ msgstr "Дали �акате да ja кори�тите оваа опција?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -148,24 +148,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Горе �е наведени по�тоечките „Linux“ партиции што �е откриени на вашиот "
@@ -723,31 +723,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -763,14 +763,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1097,19 +1097,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1125,21 +1125,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1156,14 +1156,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Во овој момент треба да изберете која партициja или партиции ќе ги кори�тите "
 "за\n"
@@ -1182,7 +1176,7 @@ msgstr ""
 "\n"
 " * „%s“: оваа опција ги брише �ите партиции на избраниот хард ди�к\n"
 "\n"
-" * „%s“: оваа опција ви овозможува автомат�ки да �оздадете „ext3“ и „swap“\n"
+" * „%s“: оваа опција ви овозможува автомат�ки да �оздадете „ext4“ и „swap“\n"
 "партиции во �лободниот про�тор од вашиот хард ди�к\n"
 "\n"
 "„%s“: ви дава при�тап до додатни карактери�тики: \n"
@@ -1233,15 +1227,6 @@ msgstr ""
 "\n"
 "За да добиете информации за различните типови на датотечни �и�теми,\n"
 "прочитајте го одделот за „ext2FS“ од „Упат�тво за употреба“.\n"
-"\n"
-"�ко ин�талирате на „PPC“ машина, ќе �акате да �оздадете мала „HFS "
-"bootstrap“\n"
-"партиција од барем 1МБ, која ќе �е кори�ти од подигнувачот „yaboot“. �ко "
-"�акате\n"
-"да ја направите партицијата малку поголема, на пример 50МБ, тоа може да "
-"биде\n"
-"кори�но како ме�то за чување резервен кернел и „ramdisk“ �лики за итни "
-"�лучаи."
 
 #: ../help.pm:526
 #, c-format
@@ -1281,34 +1266,34 @@ msgstr "Префрлање помеѓу нормален/ек�перт�ки р
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "�а вашиот ди�к е пронајдено повеќе од една „Microsoft“ партиција.\n"
@@ -1364,8 +1349,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1647,7 +1632,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1752,7 +1737,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1959,7 +1944,7 @@ msgstr "Графички интерфеј�"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1971,12 +1956,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "�ко �акате да ги избришете �ите податоци и партиции што �е наоѓаат\n"
 "на овој ди�к, прити�нете на „%s“. Внимавајте, откако ќе прити�нете\n"
diff --git a/perl-install/install/help/po/mn.po b/perl-install/install/help/po/mn.po
index 67e508606..466d01078 100644
--- a/perl-install/install/help/po/mn.po
+++ b/perl-install/install/help/po/mn.po
@@ -86,7 +86,7 @@ msgstr "Та �н� чанарыг ашиглахыг хү��ж байна уу
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -96,24 +96,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "вы вы вы вы вы г вы г бол ��р г г ��р бол төрөл г г г Erfitt төрөл бол бол г "
@@ -444,31 +444,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -484,14 +484,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -655,19 +655,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -683,21 +683,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -714,14 +714,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -762,34 +756,34 @@ msgstr "Ердийн/м�рг�жлийн горимын хооронд шилж
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "вы �мх шин� г бол н�р Цонхнууд н�р г г г н�р бол төрөл г г г Erfitt төрөл "
@@ -820,8 +814,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -984,7 +978,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1049,7 +1043,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1168,7 +1162,7 @@ msgstr ""
 #: ../help.pm:861
 #, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1177,12 +1171,12 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr "� вы � вы Цонхнууд г �."
 
 #: ../help.pm:872
diff --git a/perl-install/install/help/po/ms.po b/perl-install/install/help/po/ms.po
index c5ffcb7f5..fefe0a429 100644
--- a/perl-install/install/help/po/ms.po
+++ b/perl-install/install/help/po/ms.po
@@ -86,7 +86,7 @@ msgstr "Anda mahu memadam masukan ini dari buku telefon?"
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -96,24 +96,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "on on Nama Nama dan\n"
@@ -441,31 +441,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -481,14 +481,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -662,19 +662,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -690,21 +690,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -721,14 +721,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "on dan on\n"
 " on\n"
@@ -784,34 +778,34 @@ msgstr "normal"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "on dalam Tetingkap dan\n"
@@ -841,8 +835,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1002,7 +996,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1067,7 +1061,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1186,7 +1180,7 @@ msgstr "Konfigurasi (X) Antaramuka Grafikal"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr "dalam on dan!"
@@ -1195,12 +1189,12 @@ msgstr "dalam on dan!"
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr "on dan on on dan on Tetingkap on dan on."
 
 #: ../help.pm:872
diff --git a/perl-install/install/help/po/mt.po b/perl-install/install/help/po/mt.po
index 32cd4759a..bd5e0e9ea 100644
--- a/perl-install/install/help/po/mt.po
+++ b/perl-install/install/help/po/mt.po
@@ -123,7 +123,7 @@ msgstr "Trid tuża din il-faċilità?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -133,24 +133,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Hawn issib il-partizzjonijiet ta' Linux li nstabu fuq id-diska. Tista' \n"
@@ -672,31 +672,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -712,14 +712,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1018,19 +1018,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1046,21 +1046,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1077,14 +1077,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "F'dan il-punt trid tagħżel liema partizzjoni(jiet) se jintużaw għall-\n"
 "installazzjoni tas-sistema Mageia. Jekk diġà ġew definiti xi\n"
@@ -1103,7 +1097,7 @@ msgstr ""
 "mill-ħard disk magħżula.\n"
 "\n"
 " * \"%s\": din l-għażla awtomatikament toħloqlok partizzjonijiet\n"
-"ext3 u swap fl-ispazju vojt tad-diska.\n"
+"ext4 u swap fl-ispazju vojt tad-diska.\n"
 "\n"
 " * \"%s\" jagħtik aċċess għal iżjed faċilitajiet:\n"
 "\n"
@@ -1154,11 +1148,6 @@ msgstr ""
 "\n"
 "Biex tikseb iżjed informazzjoni dwar il-filesystems differenti disponibbli,\n"
 "jekk jogħġbok aqra l-kapitlu ext2fs fil-Manwal ta' Referenza.\n"
-"\n"
-"Jekk qed tinstalla fuq kompjuter PPC, tkun trid toħloq partizzjoni żgħira\n"
-"HFS \"bootstrap\", ta' l-inqas 1MB, li tintuża mill-bootloader yaboot. Jekk\n"
-"tiddeċiedi li tagħmlu ftit ikbar, ngħidu aħna 50MB, tista' ssibu post utli\n"
-"fejn tqiegħed kernel u ramdisk \"spare\" għal emerġenzi."
 
 #: ../help.pm:526
 #, c-format
@@ -1198,34 +1187,34 @@ msgstr "Aqleb bejn modalità normali u esperta"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Instabu iżjed minn partizzjoni waħda tal-Microsoft fuq il-ħard disk. Jekk \n"
@@ -1285,8 +1274,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1557,7 +1546,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1654,7 +1643,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1845,7 +1834,7 @@ msgstr "Interfaċċja grafika"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1857,12 +1846,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Klikkja fuq \"%s\" jekk trid tħassar l-informazzjoni u partizzjonijiet \n"
 "kollha li hemm fuq dan il-ħard disk. Oqgħod attent, wara li tagħfas \"%s\"\n"
diff --git a/perl-install/install/help/po/nb.po b/perl-install/install/help/po/nb.po
index 5440b7dd7..276edfa73 100644
--- a/perl-install/install/help/po/nb.po
+++ b/perl-install/install/help/po/nb.po
@@ -22,6 +22,7 @@ msgstr ""
 "PO-Revision-Date: 2005-09-21 23:11+0200\n"
 "Last-Translator: Per Øyvind Karlsen <pkarlsen@mandriva.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -146,7 +147,8 @@ msgstr "Ønsker du å bruke denne finessen?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -156,24 +158,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Her er de eksisterende Linux-partisjonene som ble oppdaget på din harddisk.\n"
@@ -284,8 +290,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Det er nå på tide å spesifisere hvilke programmer du ønsker å installere på\n"
-"systemet ditt. Det er tusenvis av pakker tilgjengelig for Mageia, "
-"for\n"
+"systemet ditt. Det er tusenvis av pakker tilgjengelig for Mageia, for\n"
 "å gjøre det enklere å håndtere pakkene så har de blitt plassert i grupper "
 "med\n"
 "lignende applikasjoner.\n"
@@ -411,8 +416,7 @@ msgstr ""
 "distribusjonen\n"
 "ble sluppet,\n"
 "så kan det være at sikkerhetshull ble oppdaget etter at denne versjonen\n"
-"av Mageia ble sluppet. Hvis du ikke vet hva en type tjener gjør, "
-"eller\n"
+"av Mageia ble sluppet. Hvis du ikke vet hva en type tjener gjør, eller\n"
 "hvorfor den blir installert, klikk «%s».\n"
 "«%s» vil installere de listede tjenerene og de vil bli\n"
 "startet automatisk som standard under oppstart. !!\n"
@@ -665,8 +669,8 @@ msgstr ""
 "\n"
 "   Her kan du velge om du vil at maskinen automatisk skal starte det "
 "grafiske\n"
-"grensesnittet når maskinen starter. Du vil selvsagt ønske å sjekke av for \"%"
-"s\"\n"
+"grensesnittet når maskinen starter. Du vil selvsagt ønske å sjekke av for "
+"\"%s\"\n"
 "dersom maskinen skal fungere som en tjener, eller om du ikke fikk satt opp\n"
 "det grafiske grensesnittet riktig."
 
@@ -735,31 +739,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -775,14 +783,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -795,8 +804,7 @@ 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 ""
-"Du må nå avgjøre hvor du ønsker å installere Mageia-"
-"operativsystemet\n"
+"Du må nå avgjøre hvor du ønsker å installere Mageia-operativsystemet\n"
 "på din harddisk. Hvis din harddisk er tom, eller et eksisterende\n"
 "operativsystem benytter all plassen som er tilgjengelig, vil du bli nødt til "
 "Ã¥\n"
@@ -847,8 +855,8 @@ msgstr ""
 "\n"
 " * \"%s\": hvis du ønsker å slette alle partisjoner og data, og erstatte dem "
 "med ditt\n"
-"nye Mageia-system, så velg dette valget. Vær forsiktig, du vil ikke "
-"kunne gjøre\n"
+"nye Mageia-system, så velg dette valget. Vær forsiktig, du vil ikke kunne "
+"gjøre\n"
 "om dette etter at du har bekreftet valget.\n"
 "\n"
 "   !! Hvis du velger dette valget, vil alle data på harddisken bli "
@@ -939,8 +947,8 @@ msgstr ""
 "    * «%s»: Dette er en delvis automatisert installasjon. Partisjonering er\n"
 "den eneste interaktive prosedyren.\n"
 "\n"
-"    * «%s»: Dette er en fullstendig automatisert installasjon: harddisken vil "
-"bli\n"
+"    * «%s»: Dette er en fullstendig automatisert installasjon: harddisken "
+"vil bli\n"
 "helt overskrevet, og alle data vil bli overskrevet.\n"
 "\n"
 "   Denne funksjonen er nyttig når du skal installere et antall identiske "
@@ -1097,19 +1105,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1125,21 +1136,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1156,14 +1169,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "På dette punktet må du velge hvilke partisjon(er) som skal brukes til å\n"
 "installere ditt nye Mageia-system på. Hvis partisjoner allerede har\n"
@@ -1181,7 +1188,7 @@ msgstr ""
 " * \"%s\": dette valget sletter alle partisjoner tilgjengelig på den valgte "
 "harddisken.\n"
 "\n"
-" * \"%s\": dette valget lar deg automatisk opprette ext3 og\n"
+" * \"%s\": dette valget lar deg automatisk opprette ext4 og\n"
 "swappartisjoner på din harddisk's ledige plass.\n"
 "\n"
 "\"%s\": gir deg tilgang til ekstra finesser:\n"
@@ -1238,12 +1245,6 @@ msgstr ""
 "\n"
 "For å få informasjon om de forskjellige filsystemene som er tilgjengelige,\n"
 "vennlist les ext2FS-kapittelet fra ``Reference Manual''.\n"
-"\n"
-"Hvis du installerer på en PPC-maskin, så vil du nok lage en liten\n"
-"HFS-'bootstrap-partisjon' på minst en megabyte for bruk av\n"
-"yaboot-oppstartslasteren. Hvis du ønsker  å lage partisjonen litt større,\n"
-"la oss si 50 MB, så kan du lagre en ekstra kjerne og ramdiskbilde for "
-"nødsituasjoner."
 
 #: ../help.pm:526
 #, c-format
@@ -1283,34 +1284,40 @@ msgstr "Skift mellom normal-/ekspert-modus"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Mer enn en Microsoft Windows-partisjon har blitt oppdaget på harddisken "
@@ -1369,8 +1376,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1645,7 +1653,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1708,7 +1716,8 @@ msgstr ""
 "direkte tilkobling til din printer og du vil ha muligheten til å flykte fra\n"
 "printerkræsj, og du ikke har nettverksskrivere. («%s» vil bare håndtere\n"
 "veldig enkle nettverkstilfeller og er nogenlunde treg for nettverk.) Det er\n"
-"anbefalt at du bruker «pdq» hvis dette er din første erfaring med GNU/Linux.\n"
+"anbefalt at du bruker «pdq» hvis dette er din første erfaring med GNU/"
+"Linux.\n"
 "\n"
 " * «%s» står for ``Common Unix Printing System'', er perfekt til å skrive "
 "til\n"
@@ -1724,8 +1733,7 @@ msgstr ""
 "\n"
 "Hvis du gjør et valg nå, og så senere finner ut at du ikke liker ditt "
 "utskriftssystem,\n"
-"så kan du endre det ved å kjøre PrinterDrake fra Mageia "
-"Kontrollsenter og\n"
+"så kan du endre det ved å kjøre PrinterDrake fra Mageia Kontrollsenter og\n"
 "klikke på «%s»-knappen. "
 
 #: ../help.pm:768
@@ -1751,7 +1759,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1869,8 +1877,8 @@ msgstr ""
 "\n"
 " * «%s»: sjekk ditt gjeldende valg av land. Hvis du ikke er i dette landet,\n"
 "klikk på «%s»-knappen og velg et annet land. Hvis landet ditt ikke er i\n"
-"den først viste listen, klikk «%s»-knappen for å få en fullstendig liste over "
-"land.\n"
+"den først viste listen, klikk «%s»-knappen for å få en fullstendig liste "
+"over land.\n"
 "\n"
 " ' «%s»\": som standard bestemmer DrakX din tidssone ut i fra hvilket land "
 "du\n"
@@ -1890,12 +1898,14 @@ msgstr ""
 "er\n"
 "installert i din maskin, kan du klikke på knappen og velge en annen driver.\n"
 "\n"
-" * «%s»: hvis du har ett TV-kort, dette er der informasjonen om oppsettet til "
-"det\n"
-"vil blir vist. Hvis du har et TV-kort og det ikke er oppdaget, klikk på «%s»\n"
+" * «%s»: hvis du har ett TV-kort, dette er der informasjonen om oppsettet "
+"til det\n"
+"vil blir vist. Hvis du har et TV-kort og det ikke er oppdaget, klikk på "
+"«%s»\n"
 "for å forsøke å sette det opp manuelt\n"
 "\n"
-" * «%s»: Du kan klikke på «%s» for å forandre parameterene til kortet hvis du\n"
+" * «%s»: Du kan klikke på «%s» for å forandre parameterene til kortet hvis "
+"du\n"
 "syntes at oppsettet er feil.\n"
 "\n"
 " * «%s»: Vanligvis setter DrakX opp ditt grafiske grensesnitt i\n"
@@ -1925,8 +1935,7 @@ msgstr ""
 "denne\n"
 "knappen. Dette er kun for avanserte brukere. Sjekk den utskrevne "
 "dokumentasjonen\n"
-"eller innebygd hjelp om oppstartslaster-oppsettet i Mageia "
-"Kontrollsenter.\n"
+"eller innebygd hjelp om oppstartslaster-oppsettet i Mageia Kontrollsenter.\n"
 "\n"
 " * «%s»: igjennom dette valget kan du finjustere hvilke tjenester som skal "
 "kjøre på din\n"
@@ -1952,25 +1961,26 @@ msgstr "Grafisk grensesnitt"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
 "Velg den harddisken du ønsker å slette for å installere din nye\n"
-"Mageia-partisjon. Vær forsiktig, alle data på denne partisjonen vil "
-"gå tapt\n"
+"Mageia-partisjon. Vær forsiktig, alle data på denne partisjonen vil gå tapt\n"
 "og vil ikke kunne gjenopprettes!"
 
 #: ../help.pm:866
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Klikk på \"%s\" hvis du ønsker å slette alle data og partisjoner på denne\n"
 "harddisken. Vær forsiktig, etter at du har klikket på \"%s\" vil du ikke\n"
@@ -2069,8 +2079,8 @@ msgstr "<- Forrige"
 #~ "så er det viktig å gjøre det vanskelig å bli «root».\n"
 #~ "\n"
 #~ "Passordet bør være en blanding av alfanummeriske tegn og være på minst 8\n"
-#~ "tegn. Aldri skriv ned «roo»\"-passordet -- det gjør det for enkelt å bryte "
-#~ "seg\n"
+#~ "tegn. Aldri skriv ned «roo»\"-passordet -- det gjør det for enkelt å "
+#~ "bryte seg\n"
 #~ "inn på systemet ditt. \n"
 #~ "\n"
 #~ "Uansett -- du bør ikke lage passordet for langt og komplisert siden du "
diff --git a/perl-install/install/help/po/nl.po b/perl-install/install/help/po/nl.po
index de79c51c8..aa8706c00 100644
--- a/perl-install/install/help/po/nl.po
+++ b/perl-install/install/help/po/nl.po
@@ -1,28 +1,31 @@
 # translation of DrakX-nl.po to Nederlands
 # Dutch translation of DrakX.
-# Copyright (C) 2000, 2005 Free Software Foundation, Inc.
 # Copyright (c) 2000 Mandriva
+# Copyright (c) 2011 Mageia
 # Niels Gras <niels.gras@wanadoo.nl>, 2000.
 # Jeroen ten Berge <j.ten.berge@twinbit.nl>, 2002.
 # Reinout van Schouwen <reinout@cs.vu.nl>, 2002-2005.
 # Peter Bosch <peter.bosch@hccnet.nl>, 2002.
 # Rob Teng <mandrake.tips@free.fr>, 2005.
+# Remco Rijnders <remco@webconquest.com>, 2011.
+# Marja van Waes <marja@mageia.org>, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-nl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-12 12:22+0200\n"
-"PO-Revision-Date: 2005-09-20 00:24+0200\n"
-"Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
-"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"PO-Revision-Date: 2015-01-11 16:05+0100\n"
+"Last-Translator: Marja van Waes <marja@mageia.org>\n"
+"Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 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"
@@ -40,8 +43,7 @@ msgstr ""
 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"
-"system administrator, the users you add at this point will not be "
-"authorized\n"
+"system administrator, the users you add at this point will not be authorized\n"
 "to change anything except their own files and their own configurations,\n"
 "protecting the system from unintentional or malicious changes which could\n"
 "impact on the system as a whole. You'll have to create at least one regular\n"
@@ -75,8 +77,7 @@ 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 is een multi-gebruikerssysteem, dit betekent dat iedere "
-"gebruiker \n"
+"GNU/Linux is een multi-gebruikerssysteem, dit betekent dat iedere gebruiker \n"
 "haar eigen voorkeuren, bestanden enzovoort kan hebben. U kunt de \n"
 "''Beginnershandleiding'' lezen om hierover meer te weten te komen. Maar \n"
 "in tegenstelling tot \"root\", de beheerder, zullen de gebruikers die\n"
@@ -99,7 +100,7 @@ msgstr ""
 "Desgewenst kunt u de voorgestelde gebruikersnaam veranderen.\n"
 "De volgende stap is het invoeren van een wachtwoord. Het \n"
 "wachtwoord van een (gewone) gebruiker zonder privileges is niet zo \n"
-"cruciaal als dat van de \"root\"-gebruiker vanuit veiligheidsperspectief, \n"
+"cruciaal als dat van de \"root\"-gebruiker vanuit beveiligingsperspectief, \n"
 "maar dat is geen reden om het te verwaarlozen door het leeg te laten of het\n"
 "te eenvoudig te maken: tenslotte staan uw bestanden op het spel.\n"
 "\n"
@@ -121,12 +122,12 @@ msgstr ""
 #: ../help.pm:54
 #, c-format
 msgid "User name"
-msgstr ""
+msgstr "Gebruikersnaam"
 
 #: ../help.pm:54
 #, c-format
 msgid "Accept user"
-msgstr ""
+msgstr "Accepteer gebruiker"
 
 #: ../help.pm:54
 #, c-format
@@ -136,7 +137,7 @@ msgstr "Wilt u van deze mogelijkheid gebruik maken?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -146,24 +147,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Hier zijn de bestaande Linuxpartities afgebeeld die op uw harde\n"
@@ -199,7 +200,7 @@ msgstr ""
 "een \"b\" \"het op één na laagste SCSI ID\", etc."
 
 #: ../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"
@@ -210,13 +211,12 @@ msgstr ""
 "De Mageia-installatie is verdeeld over meerdere CD-ROMs. Als een \n"
 "geselecteerd pakket te vinden is op een andere CD-ROM, zal het \n"
 "installatieprogramma de huidige CD uitwerpen en u vragen om de\n"
-"correcte CD in te leggen. Mocht u de betreffende CD niet bij de hand "
-"hebben,\n"
+"correcte CD in te leggen. Mocht u de betreffende CD niet bij de hand hebben,\n"
 "klik dan gewoon op \"%s\", de corresponderende pakketten zullen dan niet\n"
 "worden geïnstalleerd."
 
 #: ../help.pm:95
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
 "There are thousands of packages available for Mageia, and to make it\n"
@@ -274,7 +274,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Het is nu tijd om te bepalen welke programma's u op uw systeem\n"
-"wenst te installeren. Er zijn duizenden pakketten beschikbaar voor Mandriva\n"
+"wenst te installeren. Er zijn duizenden pakketten beschikbaar voor Mageia\n"
 "Linux, en om het overzichtelijker te maken zijn de pakketten in groepen\n"
 "van vergelijkbare toepassingen geplaatst.\n"
 "\n"
@@ -307,8 +307,7 @@ msgstr ""
 "omgeving kunt aangeven. Tenminste één moet geselecteerd zijn als u een\n"
 "grafische werkomgeving wilt hebben.\n"
 "\n"
-"Bij het bewegen van de muispijl boven een groepnaam zal er een korte "
-"verklarende tekst over die groep getoond worden. \n"
+"Bij het bewegen van de muispijl boven een groepnaam zal er een korte verklarende tekst over die groep getoond worden. \n"
 "\n"
 "U kunt het \"%s\"-vakje aankruisen, wat nuttig is wanneer u bekend bent \n"
 "met de aangeboden pakketten of wanneer u volledige controle wilt hebben \n"
@@ -323,8 +322,7 @@ msgstr ""
 "installatie (in tegenstelling tot opwaarderen), dan zal een dialoogvenster\n"
 "verschijnen met verscheidene opties voor een minimale installatie:\n"
 "\n"
-" * \"%s\": installeert zo min mogelijk pakketten met behoud van een werkende "
-"grafische werkomgeving.\n"
+" * \"%s\": installeert zo min mogelijk pakketten met behoud van een werkende grafische werkomgeving.\n"
 " \n"
 " * \"%s\" installeert het basissysteem plus algemene hulpprogramma's\n"
 "en bijbehorende documentatie. Deze installatie is geschikt om een\n"
@@ -335,7 +333,8 @@ msgstr ""
 "zult u slechts een opdrachtregelinterface hebben.\n"
 "Deze installatie is in totaal ongeveer 65 megabyte groot."
 
-#: ../help.pm:149 ../help.pm:591
+#: ../help.pm:149
+#: ../help.pm:591
 #, c-format
 msgid "Upgrade"
 msgstr "Opwaardering"
@@ -351,7 +350,7 @@ msgid "Truly minimal install"
 msgstr "Zeer minimale installatie"
 
 #: ../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"
@@ -368,8 +367,7 @@ msgid ""
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mageia was\n"
-"finalized. If you do not know what a particular service is supposed to do "
-"or\n"
+"finalized. If you do not know what a particular service is supposed to do or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
 "\n"
@@ -445,16 +443,14 @@ msgid ""
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you probably do not want to start any services which you do not "
-"need.\n"
+"server: you probably do not want to start any services which you do not need.\n"
 "Please remember that some services can be dangerous if they're enabled on a\n"
 "server. In general, select only those services you really need. !!"
 msgstr ""
 "In dit dialoogvenster kunt u kiezen welke diensten u wenst te starten\n"
 "tijdens de opstartfase van uw computer.\n"
 "\n"
-"Het installatieprogramma toont alle diensten die beschikbaar zijn in de "
-"huidige\n"
+"Het installatieprogramma toont alle diensten die beschikbaar zijn in de huidige\n"
 "installatie. Kijk ze aandachtig na en de-selecteer degenen die niet \n"
 "nodig zijn bij het opstarten.\n"
 "\n"
@@ -503,7 +499,7 @@ msgstr ""
 #: ../help.pm:213
 #, c-format
 msgid "Hardware clock set to GMT"
-msgstr ""
+msgstr "Hardware klok staat op GMT"
 
 #: ../help.pm:213
 #, c-format
@@ -535,7 +531,7 @@ msgstr ""
 "die het best bij uw omstandigheden past."
 
 #: ../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"
@@ -594,12 +590,10 @@ msgid ""
 "not successful in getting the display configured."
 msgstr ""
 "X (voor X Window System) is het hart van de grafische interface van GNU/\n"
-"Linux waarvan alle grafische omgevingen (KDE, GNOME, AfterStep, "
-"WindowMaker,\n"
+"Linux waarvan alle grafische omgevingen (KDE, GNOME, AfterStep, WindowMaker,\n"
 "etc.) die bij Mageia worden geleverd, afhankelijk zijn.\n"
 "\n"
-"U krijgt een lijst te zien van verschillende parameters die u kunt "
-"aanpassen\n"
+"U krijgt een lijst te zien van verschillende parameters die u kunt aanpassen\n"
 "om een optimale grafische weergave te verkrijgen:\n"
 "Grafische kaart\n"
 "\n"
@@ -640,8 +634,7 @@ msgstr ""
 "antwoordt, dan gaat de installatie door naar de volgende stap. Als u het \n"
 "bericht niet kunt zien, dan betekent dat dat een gedeelte van de gevonden\n"
 "configuratie niet klopt en zal de test automatisch na 12 seconden eindigen,\n"
-"waarmee u terugkomt in het menu. Pas de instellingen aan totdat u een "
-"correcte grafische weergave krijgt.\n"
+"waarmee u terugkomt in het menu. Pas de instellingen aan totdat u een correcte grafische weergave krijgt.\n"
 "\n"
 "\n"
 "\n"
@@ -713,34 +706,34 @@ msgstr ""
 "als u er niet in slaagde het beeld te configureren."
 
 #: ../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 drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -756,14 +749,13 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
-"this option. Be careful, because you will not be able to undo this "
-"operation\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
+"this option. Be careful, because you will not be able to undo this operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -805,8 +797,7 @@ msgstr ""
 "als u deze behoudt.\n"
 "\n"
 " * \"%s\": indien Microsoft Windows\n"
-"op uw harde schijf is geïnstalleerd en alle beschikbare ruimte in beslag "
-"neemt,\n"
+"op uw harde schijf is geïnstalleerd en alle beschikbare ruimte in beslag neemt,\n"
 "dient u vrije ruimte te creëren voor GNU/Linux. Om dat te doen, kunt u\n"
 "uw Microsoft Windows-partitie en -gegevens wissen (zie het punt\n"
 "``Gehele schijf wissen'') of uw Microsoft Windows FAT- of NTFS-partitie\n"
@@ -827,16 +818,14 @@ msgstr ""
 "systeem, kiest u deze optie. Weest u voorzichtig met deze oplossing omdat u\n"
 "na bevestiging deze keuze niet meer ongedaan kunt maken.\n"
 "\n"
-"    !! Als u deze optie kiest, zullen alle gegevens op uw schijf verloren "
-"gaan. !!\n"
+"    !! Als u deze optie kiest, zullen alle gegevens op uw schijf verloren gaan. !!\n"
 "\n"
 " * \"%s\": Deze optie verschijnt wanneer de harde schijf volledig in \n"
 "beslag genomen is door Microsoft Windows. Het kiezen van deze optie wist\n"
 "simpelweg alles op de schijf en begint van voren af aan met\n"
 "partitioneren.\n"
 "\n"
-"   !! Als u deze optie kiest, zullen alle gegevens op uw schijf verloren "
-"gaan. !!\n"
+"   !! Als u deze optie kiest, zullen alle gegevens op uw schijf verloren gaan. !!\n"
 "\n"
 " * \"%s\": kies deze optie indien u handmatig\n"
 "uw harde schijf wenst te partitioneren. Weest u voorzichtig - het is een\n"
@@ -854,7 +843,7 @@ msgstr "Een bestaande partitie gebruiken"
 #: ../help.pm:370
 #, c-format
 msgid "Use the free space on the Microsoft Windows® partition"
-msgstr ""
+msgstr "Gebruik de vrije ruimte op de Microsoft Windows® partitie"
 
 #: ../help.pm:370
 #, c-format
@@ -943,20 +932,20 @@ msgstr "Auto-installatiediskette aanmaken"
 #: ../help.pm:405
 #, c-format
 msgid "Replay"
-msgstr ""
+msgstr "Herhaling"
 
 #: ../help.pm:405
 #, c-format
 msgid "Automated"
-msgstr ""
+msgstr "Geautomatiseerd"
 
 #: ../help.pm:405
 #, c-format
 msgid "Save packages selection"
-msgstr ""
+msgstr "Bewaar pakketselectie"
 
 #: ../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"
@@ -964,8 +953,7 @@ msgid ""
 "\n"
 "Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to "
-"reformat\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to reformat\n"
 "partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
 "Please be careful when selecting partitions. After the formatting is\n"
@@ -1004,7 +992,7 @@ msgstr ""
 "onleesbare blokken gecontroleerd moeten worden."
 
 #: ../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"
@@ -1034,7 +1022,7 @@ msgstr ""
 "op \"%s\" om af te breken."
 
 #: ../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"
@@ -1070,24 +1058,24 @@ msgid "Security Administrator"
 msgstr "Beveiligingsbeheerder"
 
 #: ../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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1103,21 +1091,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1134,14 +1122,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Op dit punt dient u te kiezen welke partitie(s) gebruikt zullen worden voor\n"
 "de installatie van uw Mageia systeem. Indien er reeds partities\n"
@@ -1149,10 +1131,8 @@ msgstr ""
 "ander partitioneringsprogramma, kunt u bestaande partities gebruiken.\n"
 "In andere gevallen moeten er harde schijf-partities gedefinieerd worden.\n"
 "\n"
-"Om partities te creëren, dient u eerst een harde schijf te kiezen. U kunt "
-"de\n"
-"te partitioneren schijf selecteren door op \"hda\" te klikken voor de "
-"eerste\n"
+"Om partities te creëren, dient u eerst een harde schijf te kiezen. U kunt de\n"
+"te partitioneren schijf selecteren door op \"hda\" te klikken voor de eerste\n"
 "IDE-schijf, \"hdb\" voor de tweede, \"sda\" voor de eerste SCSI-schijf\n"
 "enzovoort.\n"
 "\n"
@@ -1162,14 +1142,13 @@ msgstr ""
 " * \"%s\": deze optie verwijdert alle partities op de\n"
 "geselecteerde harde schijf.\n"
 "\n"
-" * \"%s\": deze optie creëert automatisch ext3- en swap-\n"
+" * \"%s\": deze optie creëert automatisch ext4- en swap-\n"
 "partities in de vrije ruimte op uw harde schijf.\n"
 "\n"
 " \"%s\": geeft toegang tot extra opties:\n"
 "\n"
 " * \"%s\": slaat de partitietabel op op een diskette. Nuttig om\n"
-"later zonodig de partitietabel te herstellen. Het is sterk aanbevolen deze "
-"stap uit\n"
+"later zonodig de partitietabel te herstellen. Het is sterk aanbevolen deze stap uit\n"
 "te voeren.\n"
 "\n"
 " * \"%s\": deze optie stelt u in staat om een eerder opgeslagen\n"
@@ -1187,8 +1166,7 @@ msgstr ""
 "CD-ROMs te koppelen en te ontkoppelen.\n"
 "\n"
 " * \"%s\": gebruik deze optie indien u een wizard wenst te gebruiken om\n"
-"uw harde schijf mee te partitioneren. Dit is aanbevolen als u geen brede "
-"kennis\n"
+"uw harde schijf mee te partitioneren. Dit is aanbevolen als u geen brede kennis\n"
 "heeft over partitioneren.\n"
 "\n"
 " * \"%s\": gebruik deze optie om uw wijzigingen te annuleren.\n"
@@ -1196,52 +1174,40 @@ msgstr ""
 " * \"%s\" laat extra handelingen toe op\n"
 "partities (type, opties, formaat) en geeft meer informatie over de schijf.\n"
 "\n"
-" * \"%s\": wanneer u klaar bent met het partitioneren van uw harde schijf, "
-"zal dit\n"
+" * \"%s\": wanneer u klaar bent met het partitioneren van uw harde schijf, zal dit\n"
 "de wijzigingen wegschrijven naar schijf.\n"
 "\n"
 "Bij het definiëren van de partitiegrootte kunt u de grootte fijnafregelen\n"
 "met de pijltjestoetsen op uw toetsenbord.\n"
 "\n"
-"Merk op: u kunt iedere optie met behulp van het toetsenbord bereiken. "
-"Navigeer door\n"
+"Merk op: u kunt iedere optie met behulp van het toetsenbord bereiken. Navigeer door\n"
 "de partities met behulp van [Tab] en [Omhoog/Omlaag] pijlen.\n"
 "\n"
-"Wanneer een partitie is geselecteerd, kunt u deze toetscombinaties "
-"gebruiken:\n"
+"Wanneer een partitie is geselecteerd, kunt u deze toetscombinaties gebruiken:\n"
 "\n"
-" * Ctrl+c om een nieuwe partitie te creëren (als een lege ruimte is "
-"geselecteerd)\n"
+" * Ctrl+c om een nieuwe partitie te creëren (als een lege ruimte is geselecteerd)\n"
 "\n"
 " * Ctrl+d om een partitie te verwijderen\n"
 "\n"
 " * Ctrl+m om het koppelpunt in te stellen\n"
 "\n"
-"Voor meer informatie over de verschillende types bestandssystemen die er "
-"zijn,\n"
+"Voor meer informatie over de verschillende types bestandssystemen die er zijn,\n"
 "leest u het hoofdstuk 'ext2FS' van de ``Referentiehandleiding''.\n"
-"\n"
-"In het geval dat u op een PPC computer aan het installeren bent, zult u een "
-"kleine\n"
-"HFS \"bootstrap\"-partitie van tenminste 1MB willen creëren voor gebruik\n"
-"door de yaboot-opstartlader. Indien u liever de partitie wat groter maakt,\n"
-"zeg 50MB, dan vindt u het misschien een nuttige plek om een reserve kernel-\n"
-"en ramdisk beeldbestand in op te slaan voor opstart-noodgevallen."
 
 #: ../help.pm:526
 #, c-format
 msgid "Save partition table"
-msgstr ""
+msgstr "Bewaar partitioneringstabel"
 
 #: ../help.pm:526
 #, c-format
 msgid "Restore partition table"
-msgstr ""
+msgstr "Herstel partitioneringstabel"
 
 #: ../help.pm:526
 #, c-format
 msgid "Rescue partition table"
-msgstr ""
+msgstr "Red partitioneringstabel"
 
 #: ../help.pm:526
 #, c-format
@@ -1251,12 +1217,12 @@ msgstr "Automatische koppeling van verwisselbare media"
 #: ../help.pm:526
 #, c-format
 msgid "Wizard"
-msgstr ""
+msgstr "Wizard"
 
 #: ../help.pm:526
 #, c-format
 msgid "Undo"
-msgstr ""
+msgstr "Herstel"
 
 #: ../help.pm:526
 #, c-format
@@ -1264,36 +1230,36 @@ msgid "Toggle between normal/expert mode"
 msgstr "Normale/expert-modus"
 
 #: ../help.pm:536
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Er is meer dan één Microsoft-partitie op uw harde schijf gevonden.\n"
@@ -1320,8 +1286,7 @@ msgstr ""
 "\n"
 " * \"d\" betekent \"slave harde schijf op de secundaire IDE controller\".\n"
 "\n"
-"Bij SCSI harde schijven betekent een \"a\" \"laagste SCSI ID\", een \"b\" "
-"\"op één na laagste SCSI ID\", enzovoort.\n"
+"Bij SCSI harde schijven betekent een \"a\" \"laagste SCSI ID\", een \"b\" \"op één na laagste SCSI ID\", enzovoort.\n"
 "\n"
 "\"Windows naam\" is de letter van uw harde schijf onder Windows (de\n"
 "eerste schijf of partitie wordt \"C:\" genoemd)."
@@ -1330,17 +1295,15 @@ msgstr ""
 #, c-format
 msgid ""
 "\"%s\": check the current country selection. If you're not in this country,\n"
-"click on the \"%s\" button and choose another. If your country is not in "
-"the\n"
+"click on the \"%s\" button and choose another. If your country is not in the\n"
 "list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 "\"%s\": de huidige landselectie nagaan. Indien u zich niet in dit land\n"
-"bevindt, klik dan op de \"%s\"-knop en kies een ander land. Als uw land niet "
-"in de getoonde lijst staat, klik dan op de \"%s\"-knop om de complete\n"
+"bevindt, klik dan op de \"%s\"-knop en kies een ander land. Als uw land niet in de getoonde lijst staat, klik dan op de \"%s\"-knop om de complete\n"
 "landenlijst op te vragen."
 
 #: ../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"
@@ -1351,8 +1314,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1385,8 +1348,7 @@ msgstr ""
 "\n"
 "Het gebruik van de ``Opwaardering''-optie zou prima moeten werken op\n"
 "Mageia versie \"8.1\" of recenter. Het uitvoeren van een\n"
-"opwaardering op versies eerder dan Mageia versie \"8.1\" is "
-"afgeraden."
+"opwaardering op versies eerder dan Mageia versie \"8.1\" is afgeraden."
 
 # Extra stukje toegevoegd over Nederlandse layout
 #: ../help.pm:594
@@ -1410,16 +1372,12 @@ msgid ""
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
 "Afhankelijk van de taal die u heeft gekozen, selecteert DrakX automatisch\n"
-"een bepaalde toetsenbordindeling. Ga na of de geselecteerde indeling u "
-"bevalt, en zoniet kies dan een andere toetsenbordindeling.\n"
+"een bepaalde toetsenbordindeling. Ga na of de geselecteerde indeling u bevalt, en zoniet kies dan een andere toetsenbordindeling.\n"
 "\n"
 "Merk op dat de getoonde lijst toetsenbordindelingen bevat, en geen talen.\n"
-"Wanneer u in Nederland woont, heeft u waarschijnlijk een toetsenbord van "
-"het\n"
-"type \"VS (internationaal)\". Toetsenborden met een \"Nederlandse\" "
-"indeling\n"
-"komen niet veel voor. Het kan ook zijn dat u een Nederlands sprekende "
-"inwoner\n"
+"Wanneer u in Nederland woont, heeft u waarschijnlijk een toetsenbord van het\n"
+"type \"VS (internationaal)\". Toetsenborden met een \"Nederlandse\" indeling\n"
+"komen niet veel voor. Het kan ook zijn dat u een Nederlands sprekende inwoner\n"
 "van België bent en gebruik maakt van een toetsenbord met Franse indeling.\n"
 "Deze installatiestap zorgt ervoor dat u in alle gevallen de juiste\n"
 "toetsenbordindeling kunt kiezen.\n"
@@ -1432,7 +1390,7 @@ msgstr ""
 "te kiezen die zal schakelen tussen de Latijn- en niet-Latijnse indelingen."
 
 #: ../help.pm:612
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1527,7 +1485,7 @@ msgstr "Spaans"
 #: ../help.pm:643
 #, c-format
 msgid "Use Unicode by default"
-msgstr ""
+msgstr "Gebruik standaard Unicode"
 
 #: ../help.pm:646
 #, c-format
@@ -1631,10 +1589,9 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
-"Choosing \"%s\" will not install any boot loader. Use this option only if "
-"you\n"
+"Choosing \"%s\" will not install any boot loader. Use this option only if you\n"
 "know what you're doing."
 msgstr ""
 "Een opstartlader is een klein programmaatje dat door de computer gestart\n"
@@ -1643,21 +1600,17 @@ msgstr ""
 "opstartlader volkomen automatisch. Het installatieprogramma analyseert de\n"
 "bootsector van de schijf handelt naar bevind van zaken:\n"
 "\n"
-" * als een Windows-bootsector is gevonden, dan zal het deze vervangen door "
-"een GRUB/LILO bootsector. Op deze manier zult u de mogelijkheid hebben om "
-"ofwel GNU/Linux te starten, ofwel een ander besturingssysteem.\n"
+" * als een Windows-bootsector is gevonden, dan zal het deze vervangen door een GRUB/LILO bootsector. Op deze manier zult u de mogelijkheid hebben om ofwel GNU/Linux te starten, ofwel een ander besturingssysteem.\n"
 "\n"
-" * als een GRUB- of LILO-bootsector is gevonden, dan zal het deze vervangen "
-"door een nieuwe.\n"
+" * als een GRUB- of LILO-bootsector is gevonden, dan zal het deze vervangen door een nieuwe.\n"
 "\n"
-"Wanneer het installatieprogramma niet kan bepalen waar de bootsector "
-"geplaatst moet worden dan zal DrakX u vragen waar de\n"
+"Wanneer het installatieprogramma niet kan bepalen waar de bootsector geplaatst moet worden dan zal DrakX u vragen waar de\n"
 "opstartlader terecht moet komen. In het algemeen is \"%s\" de\n"
 "veiligste locatie. Met de keuze \"%s\" wordt er in het geheel geen \n"
 "opstartlader geïnstalleerd. Gebruik dit alleen als u weet wat u doet."
 
 #: ../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"
@@ -1704,15 +1657,13 @@ msgstr ""
 "afdruksysteem, zodat het overweg kan met oudere besturingssystemen\n"
 "die wellicht afdrukdiensten vereisen. Alhoewel het behoorlijk krachtig is,\n"
 "is de basisinstallatie bijna net zo eenvoudig als \"pdq\". In het geval dat\n"
-"u een \"lpd\"-server-emulatie nodig heeft, dient u de \"cups-lpd\"-"
-"voorziening\n"
+"u een \"lpd\"-server-emulatie nodig heeft, dient u de \"cups-lpd\"-voorziening\n"
 "in te schakelen. \"%s\" biedt grafische schillen voor het afdrukken en\n"
 "het beheren van de printer.\n"
 "\n"
 "Wanneer u nu een keuze maakt en er later achter komt dat uw afdruksysteem\n"
 "u niet bevalt dan kunt u het veranderen door PrinterDrake uit te voeren\n"
-"vanuit het Mageia Configuratiecentrum en op de \"%s\"-knop te "
-"klikken."
+"vanuit het Mageia Configuratiecentrum en op de \"%s\"-knop te klikken."
 
 #: ../help.pm:768
 #, c-format
@@ -1722,7 +1673,7 @@ msgstr "pdq"
 #: ../help.pm:724
 #, c-format
 msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
 
 #: ../help.pm:724
 #, c-format
@@ -1737,7 +1688,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1781,7 +1732,7 @@ msgstr ""
 "knop klikken en een ander stuurprogramma kiezen."
 
 #: ../help.pm:794
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "As a review, DrakX will present a summary of information it has gathered\n"
 "about your system. Depending on the hardware installed on your machine, you\n"
@@ -1862,14 +1813,7 @@ msgstr ""
 "van het land dat u gekozen heeft. U kunt op de \"%s\" knop\n"
 "drukken als dit incorrect is.\n"
 "\n"
-" * \"%s\": de huidige muisconfiguratie nagaan. Zonodig kunt u op de knop "
-"klikken om hem aan te passen.\n"
-"\n"
-" * \"%s\": klikken op de \"%s\"-knop zal de\n"
-"printerconfiguratie-wizard openen. Raadpleeg het corresponderende\n"
-"hoofdstuk van de ``Beginnershandleiding'' voor meer informatie over\n"
-"hoe u een nieuwe printer instelt. De in onze handleiding getoonde interface\n"
-"lijkt op degene die tijdens de installatie gebruikt wordt.\n"
+" * \"%s\": de huidige muisconfiguratie nagaan. Zonodig kunt u op de knop klikken om hem aan te passen.\n"
 "\n"
 " * \"%s\": indien een geluidskaart gevonden is op uw systeem,\n"
 "wordt dat hier weergegeven. In het geval dat de aangegeven geluidskaart\n"
@@ -1915,9 +1859,9 @@ msgstr ""
 "gaat inzetten dan is het een goed idee om deze instellingen na te lopen."
 
 #: ../help.pm:809
-#, fuzzy, c-format
+#, c-format
 msgid "TV card"
-msgstr "Interne ISDN kaart"
+msgstr "TV-kaart"
 
 #: ../help.pm:809
 #, c-format
@@ -1930,9 +1874,9 @@ msgid "Graphical Interface"
 msgstr "Grafische interface"
 
 #: ../help.pm:861
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1944,18 +1888,17 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Klik op \"%s\" wanneer u alle gegevens en partities die zich \n"
 "op deze harde schijf bevinden, wilt wissen. Wees voorzichtig, want na het\n"
 "klikken op \"%s\" zult u niet in staat zijn om enige op de schijf\n"
-"aanwezige gegevens of partities terug te halen, met inbegrip van alle "
-"Windows-gegevens.\n"
+"aanwezige gegevens of partities terug te halen, met inbegrip van alle Windows-gegevens.\n"
 "\n"
 "Klik op \"%s\" om deze operatie te stoppen zonder daarbij \n"
 "gegevens of partities op de schijf te verliezen."
@@ -1986,7 +1929,6 @@ msgstr "<- Vorige"
 #~ "printer.\n"
 #~ "De in onze handleiding getoonde interface lijkt sterk op degene gebruikt\n"
 #~ "tijdens de installatie."
-
 #~ msgid ""
 #~ "This is the most crucial decision point for the security of your GNU/"
 #~ "Linux\n"
@@ -2078,6 +2020,6 @@ msgstr "<- Vorige"
 #~ "Mocht u het lastig vinden wachtwoorden te onthouden, als uw computer\n"
 #~ "nooit verbonden zal zijn met het internet of als u absoluut iedereen\n"
 #~ "vertrouwt die toegang heeft tot uw computer, kunt u kiezen voor \"%s\"."
-
 #~ msgid "authentication"
 #~ msgstr "aanmeldingscontrole"
+
diff --git a/perl-install/install/help/po/nn.po b/perl-install/install/help/po/nn.po
index e4e5ac362..69519da74 100644
--- a/perl-install/install/help/po/nn.po
+++ b/perl-install/install/help/po/nn.po
@@ -140,7 +140,7 @@ msgstr "Ønskjer du å bruka denne funksjonen?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -150,24 +150,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Her er ei oversikt over Linux-partisjonar på harddisken. Du bør vanlegvis\n"
@@ -681,31 +681,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -721,14 +721,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1025,19 +1025,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1053,21 +1053,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1084,14 +1084,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "No må du velja kva partisjonar du vil installera Mageia på. Om du "
 "allereie har ferdige partisjonar, frå tidlegare installasjonar av GNU/Linux "
@@ -1106,7 +1100,7 @@ msgstr ""
 "\n"
 " – «%s»: Slettar alle partisjonar på harddisken.\n"
 "\n"
-" – «%s»: Lagar automatisk ext3- og vekslepartisjonar på den ledige "
+" – «%s»: Lagar automatisk ext4- og vekslepartisjonar på den ledige "
 "harddiskplassen.\n"
 "\n"
 "«%s»: Gjev tilgang til fleire funksjonar:\n"
@@ -1153,11 +1147,6 @@ msgstr ""
 "\n"
 "Du kan lesa meir om forskjellige filsystem i kapittelet «ext2FS» i "
 "referansehandboka.\n"
-"\n"
-"Om du installerer på ei PPC-maskin, bør du laga ein liten HFS-"
-"oppstartslastarpartisjon på minst 1 MiB for yaboot. Vis du lagar partisjonen "
-"større, kanskje 50 MiB, kan du bruka han til å lagra ein ekstra kjerne, og "
-"eventuelt ramdisk-bilete for nødsituasjonar.r"
 
 #: ../help.pm:526
 #, c-format
@@ -1197,34 +1186,34 @@ msgstr "Byt mellom normal- og ekspertmodus"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Oppdaga meir enn éin Microsoft-partisjon på harddisken.\n"
@@ -1275,8 +1264,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1449,7 +1438,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1508,7 +1497,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1615,7 +1604,7 @@ msgstr "Grafisk grensesnitt"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1626,12 +1615,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Trykk «%s» om du ønskjer å sletta alle data og partisjonar på denne\n"
 "harddisken. Ver forsiktig, då du ikkje kan gjenoppretta eventuelle data\n"
diff --git a/perl-install/install/help/po/pa_IN.po b/perl-install/install/help/po/pa_IN.po
index 5d7c35d54..8bfdd2dad 100644
--- a/perl-install/install/help/po/pa_IN.po
+++ b/perl-install/install/help/po/pa_IN.po
@@ -90,7 +90,7 @@ msgstr "ਕੀ ਤà©�ਸੀਂ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਵਰਤਣੀ ਚà
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -100,24 +100,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -439,31 +439,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -479,14 +479,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -643,19 +643,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -671,21 +671,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -702,14 +702,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -750,34 +744,34 @@ msgstr "ਸਧਾਰਨ/ਮਾਹਿਰ ਵਿਧੀ ਵਿਚਕਾਰ ਤਬà¨
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -805,8 +799,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -963,7 +957,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1022,7 +1016,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1129,7 +1123,7 @@ msgstr "ਗਰਾਫੀਕਲ ਇੰਟਰਫੇਸ"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1141,12 +1135,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "\"%s\" ਤੇ ਕਲਿੱਕ ਕਰੋ ਜੇ ਤ�ਸੀਂ ਇਸ ਹਾਰਡ ਡਰਾਈਵ ਤੇ ਸਾਰਾ ਡਾਟਾ ਅਤੇ ਭਾਗ\n"
 "ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ। ਧਿਆਨ ਰੱਖੋ, \"%s\" ਤੇ ਕਲਿੱਕ ਕਰਨ ਮਗਰੋਂ, ਤ�ਸੀਂ ਇਸ ਡਰਾਈਵ\n"
diff --git a/perl-install/install/help/po/pl.po b/perl-install/install/help/po/pl.po
index 894e50255..4c151aeb5 100644
--- a/perl-install/install/help/po/pl.po
+++ b/perl-install/install/help/po/pl.po
@@ -18,12 +18,13 @@ msgstr ""
 "PO-Revision-Date: 2005-10-22 14:46+0200\n"
 "Last-Translator: Tomasz Bednarski <tomasz.bednarski@mandriva.pl>\n"
 "Language-Team: polish <pl@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../help.pm:14
 #, fuzzy, c-format
@@ -136,7 +137,8 @@ msgstr "Czy chcesz wykorzystać tą funkcję?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -146,24 +148,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Powyżej pokazano wykryte na Twoim dysku istniejące partycje linuksowe.\n"
@@ -708,31 +714,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -748,14 +758,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -917,8 +928,8 @@ msgstr ""
 "\n"
 "(*) Wymagana jest dyskietka sformatowana z systemem plików FAT. Aby\n"
 "utworzyć taką dyskietkę w systemie GNU/Linux, wpisz polecenie\n"
-"\"mformat a:\", lub \"fdformat /dev/fd0\", a następnie \"mkfs.vfat /dev/fd0"
-"\"."
+"\"mformat a:\", lub \"fdformat /dev/fd0\", a następnie \"mkfs.vfat /dev/"
+"fd0\"."
 
 #: ../help.pm:412
 #, c-format
@@ -1002,8 +1013,8 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"W czasie, jaki upłynął od początkowego wydania Mageia, być może "
-"niektóre pakietyzostały zaktualizowane. Niektóre błędy mogły\n"
+"W czasie, jaki upłynął od początkowego wydania Mageia, być może niektóre "
+"pakietyzostały zaktualizowane. Niektóre błędy mogły\n"
 "zostać naprawione, zaś problemy z bezpieczeństwem rozwiązane. Aby\n"
 "skorzystać z możliwości aktualizacji, dobrze jest pobrać część danych\n"
 "z Internetu. Wybierz \"%s\", jeśli posiadasz działające połączenie\n"
@@ -1056,19 +1067,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1084,21 +1098,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1115,18 +1131,11 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "W tym etapie instalacji wybierasz partycje, na których będzie instalowany\n"
-"Mageia. Jeśli partycje istnieją (np. pozostały po poprzedniej "
-"instalacji,\n"
+"Mageia. Jeśli partycje istnieją (np. pozostały po poprzedniej instalacji,\n"
 "lub też zostały założone innym narzędziem), to można ich użyć do "
 "instalacji.\n"
 "W innym przypadku należy je utworzyć.\n"
@@ -1141,7 +1150,7 @@ msgstr ""
 "   * \"%s\": ta opcja kasuje wszystkie partycje na wybranym dysku.\n"
 "\n"
 "   * \"%s\": ta opcja automatycznie tworzy partycje\n"
-"     ext3 oraz swap na wolnej (niespartycjonowanej) przestrzeni na dysku\n"
+"     ext4 oraz swap na wolnej (niespartycjonowanej) przestrzeni na dysku\n"
 "\n"
 "   * \"%s\": daje dostęp do dodatkowych opcji:\n"
 "\n"
@@ -1193,15 +1202,6 @@ msgstr ""
 "\n"
 "Aby uzyskać informacje dotyczące różnych dostępnych rodzajów systemów\n"
 "plików, należy przeczytać rozdział ext2fs podręcznika.\n"
-"\n"
-"Jeśli instalacja odbywa się na komputerze PPC, system będzie wymagał\n"
-"utworzenia małej partycji HFS \"rozruchowej\" (bootstrap) o wielkości\n"
-"co najmniej 1MB, która będzie używana przez program rozruchowy yaboot.\n"
-"Jeśli chcesz, aby ta partycja była większa, powiedzmy 50 MB, można\n"
-"ją traktować jako użyteczne miejsce np. do przechowywania zapasowego\n"
-"jądra oraz obrazów do uniknięcia skutków ewentualnych awarii "
-"uniemożliwiających\n"
-"rozruch systemu z normalnej partycji."
 
 #: ../help.pm:526
 #, c-format
@@ -1241,34 +1241,40 @@ msgstr "Przełącz między trybem zwykłym a zaawansowanym"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Na dysku wykryto więcej niż jedną partycję Windows. Wybierz, którą\n"
@@ -1323,8 +1329,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1600,7 +1607,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1705,7 +1712,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1901,7 +1908,7 @@ msgstr "Interfejs graficzny"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1913,12 +1920,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Wybierz \"%s\", jeśli chcesz usunąć wszystkie dane i partycje zapisane\n"
 "na tym dysku. Pamiętaj, po wybraniu \"%s\", nie będzie\n"
diff --git a/perl-install/install/help/po/pt.po b/perl-install/install/help/po/pt.po
index 0cae0df13..d91e33200 100644
--- a/perl-install/install/help/po/pt.po
+++ b/perl-install/install/help/po/pt.po
@@ -24,6 +24,7 @@ msgstr ""
 "PO-Revision-Date: 2007-02-18 17:17+0000\n"
 "Last-Translator: Zé <mmodem00@gmail.com>\n"
 "Language-Team: Português <pt@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -139,7 +140,8 @@ msgstr "Deseja usar esta opção?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -149,24 +151,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Aqui estão listadas partições Linux existentes detectadas no seu disco.\n"
@@ -293,8 +299,8 @@ msgstr ""
 "configurar o seu sistema para que cumpra o mais possível com as \n"
 "especificações Linux Standard Base.\n"
 "\n"
-"   Ao seleccionar o grupo \"LSB\" irá também instalar as séries kernel \"2.4"
-"\",\n"
+"   Ao seleccionar o grupo \"LSB\" irá também instalar as séries kernel "
+"\"2.4\",\n"
 "em vez do \"2.6\" predefinido. Isto é para garantir concordância 100%%- LSB\n"
 "do sistema. No entanto, se não seleccionar o grupo \"LSB\", terá na mesma\n"
 "um sistema que é 100%% LSB-concordante.\n"
@@ -703,31 +709,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -743,14 +753,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1049,19 +1060,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1077,21 +1091,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1108,14 +1124,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Neste fase, precisa escolher que partições vão ser utilizadas para a\n"
 "instalação do seu sistema Mageia. Se já foram definidas partições,\n"
@@ -1133,7 +1143,7 @@ msgstr ""
 " * \"%s\": esta opção apaga todas as partições do disco seleccionado\n"
 "\n"
 " * \"%s\": esta opção permite criar automaticamente partições\n"
-"ext3 e partições swap no espaço livre do seu disco\n"
+"ext4 e partições swap no espaço livre do seu disco\n"
 "\n"
 "\"%s\": dá acesso para opções adicionais:\n"
 "\n"
@@ -1183,12 +1193,6 @@ msgstr ""
 "Para obter mais informações acerca dos diferentes tipos de sistemas de\n"
 "ficheiros disponíveis, por favor leia o capítulo ext2FS do ``Manual de\n"
 "Referência''.\n"
-"\n"
-"Se está a instalar numa máquina PPC, irá querer criar umas pequena partição\n"
-"de arranque HFS com pelo menos 1MB, que será usada pelo carregador de\n"
-"arranque yaboot. Se optar por criar uma partição maior, tipo 50MB, pode-lhe\n"
-"ser útil para gravar um kernel e a uma imagem ramdisk para situações de\n"
-"de emergência."
 
 #: ../help.pm:526
 #, c-format
@@ -1228,34 +1232,40 @@ msgstr "Alterna entre os modos normal/perito"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Mais do que uma partição Microsoft foi detectada no seu disco rígido.\n"
@@ -1312,8 +1322,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1580,7 +1591,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1680,7 +1691,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1872,7 +1883,7 @@ msgstr "Interface gráfico"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1884,12 +1895,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Clique em \"%s\" se deseja apagar todos os dados e partições\n"
 "presentes neste disco rígido.Tenha cuidado, depois de clicar em \"%s\",\n"
diff --git a/perl-install/install/help/po/pt_BR.po b/perl-install/install/help/po/pt_BR.po
index 275184f07..3dd93f8ea 100644
--- a/perl-install/install/help/po/pt_BR.po
+++ b/perl-install/install/help/po/pt_BR.po
@@ -23,6 +23,7 @@ msgstr ""
 "PO-Revision-Date: 2008-09-22 14:14-0300\n"
 "Last-Translator: Felipe Arruda <felipemiguel@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,8 +39,7 @@ msgid ""
 "button will reboot your computer."
 msgstr ""
 "Antes de continuar, você deve ler com atenção os termos da licença. Ela \n"
-"cobre a distribuição Mageia inteira. Se você concorda com todos os "
-"termos,\n"
+"cobre a distribuição Mageia inteira. Se você concorda com todos os termos,\n"
 "clique em \"%s\". Se não concordar, clique no botão \"%s\"\n"
 "para reiniciar seu computador."
 
@@ -147,7 +147,8 @@ msgstr "Você quer usar este recurso?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -157,24 +158,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Aqui estão listadas as partições Linux detectadas no seu disco rígido.\n"
@@ -730,31 +735,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -770,14 +779,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1089,19 +1099,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1117,21 +1130,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1148,14 +1163,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Agora você precisa escolher qual(is) partição(ões) serão usadas para "
 "instalar o\n"
@@ -1174,7 +1183,7 @@ msgstr ""
 " * \"%s\": esta opção removerá todas as partições do disco rígido "
 "selecionado.\n"
 "\n"
-" * \"%s\": esta opção permite criar automaticamente partições ext3 e swap "
+" * \"%s\": esta opção permite criar automaticamente partições ext4 e swap "
 "no\n"
 " espaço livre do seu disco rígido.\n"
 "\n"
@@ -1227,12 +1236,6 @@ msgstr ""
 "Para mais informações sobre os diferentes tipos de sistemas de arquivos \n"
 "disponíveis, por favor, leia o capítulo sobre ext2FS do \"Manual de "
 "Referência\".\n"
-"\n"
-"Se você está instalando em uma Máquina PPC, você vai precisar criar uma\n"
-"pequena partição \"bootstrap\" HFS de no mínimo 1MB para usar com o \n"
-"gerenciador de boot yaboot. Se você quiser criar uma partição um\n"
-"pouco maior, digamos 50MB, você pode usar o espaço para guardar\n"
-"um kernel extra e uma imagem ramdisk para situações de emergência."
 
 #: ../help.pm:526
 #, c-format
@@ -1272,34 +1275,40 @@ msgstr "Mudar entre modo normal/expert"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Mais de uma partição Microsoft Windows foi detectada em seu disco\n"
@@ -1357,8 +1366,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1636,7 +1646,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1722,8 +1732,7 @@ msgstr ""
 "gerenciar a impressão.\n"
 "\n"
 "Você poderá mudar a sua escolha após a instalação utilizando o\n"
-"PrinterDrake no Centro de Controle Mageia, e clicando no botão \"%s"
-"\"."
+"PrinterDrake no Centro de Controle Mageia, e clicando no botão \"%s\"."
 
 #: ../help.pm:768
 #, c-format
@@ -1748,7 +1757,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1938,7 +1947,7 @@ msgstr "Interface gráfica"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1950,12 +1959,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Clique em \"%s\" se você quiser apagar todos os dados e partições \n"
 "existentes neste disco rígido. Tenha cuidado, pois após clicar em \"%s\", \n"
diff --git a/perl-install/install/help/po/ro.po b/perl-install/install/help/po/ro.po
index 3986803b1..f836a27ea 100644
--- a/perl-install/install/help/po/ro.po
+++ b/perl-install/install/help/po/ro.po
@@ -14,6 +14,7 @@ msgstr ""
 "Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
 "Language-Team: Romanian Translators for Free Software <rtfs-project@lists."
 "sourceforge.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -88,7 +89,8 @@ msgstr "Vreţi să folosiţi această facilitate?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -98,24 +100,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -412,31 +418,35 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -452,14 +462,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -616,19 +627,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -644,21 +658,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -675,14 +691,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -723,34 +733,40 @@ msgstr "Schimbă între modul normal/expert"
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -775,8 +791,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -933,7 +950,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -992,7 +1009,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1096,7 +1113,7 @@ msgstr "Interfaţă grafică"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1109,12 +1126,14 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Clic pe \"%s\" dacă doriţi ştergerea tuturor datelor şi partiţiilor "
 "existente\n"
diff --git a/perl-install/install/help/po/ru.po b/perl-install/install/help/po/ru.po
index b32cdcb8b..980beac47 100644
--- a/perl-install/install/help/po/ru.po
+++ b/perl-install/install/help/po/ru.po
@@ -10,18 +10,18 @@ msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-12 12:22+0200\n"
-"PO-Revision-Date: 2005-09-20 18:19+0300\n"
-"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
+"PO-Revision-Date: 2013-03-31 22:15-0000\n"
+"Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian <doc@lafox.net>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../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"
@@ -38,8 +38,7 @@ msgstr ""
 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"
-"system administrator, the users you add at this point will not be "
-"authorized\n"
+"system administrator, the users you add at this point will not be authorized\n"
 "to change anything except their own files and their own configurations,\n"
 "protecting the system from unintentional or malicious changes which could\n"
 "impact on the system as a whole. You'll have to create at least one regular\n"
@@ -113,12 +112,12 @@ msgstr ""
 #: ../help.pm:54
 #, c-format
 msgid "User name"
-msgstr ""
+msgstr "Им� пользовател�"
 
 #: ../help.pm:54
 #, c-format
 msgid "Accept user"
-msgstr ""
+msgstr "Прин�ть пользовател�"
 
 #: ../help.pm:54
 #, c-format
@@ -130,7 +129,7 @@ msgstr "Хотите и�пользовать �ту возможно�ть?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -140,24 +139,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Перечи�ленное выше �вл�ет�� �уще�твующими разделами Linux, определенными на\n"
@@ -174,7 +173,7 @@ msgstr ""
 "\"�азвание\" раздел�ет�� на: \"тип же�ткого ди�ка\", \"номер же�ткого\n"
 "ди�ка\", \"номер раздела\" (например, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" �то \"hd\", е�ли ваш же�ткий ди�к IDE и \"sd\", е�ли он\n"
+"\"Hard disk drive type\" �то \"hd\", е�ли ваш же�ткий ди�к IDE и \"sd\", е�ли он\n"
 "SCSI.\n"
 "\n"
 "\"�омер же�ткого ди�ка\" в�егда �вл�ет�� буквой по�ле \"hd\" или \"sd\".\n"
@@ -194,7 +193,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../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"
@@ -204,14 +203,13 @@ msgid ""
 msgstr ""
 "Ин�талл�ци� Mageia размещена на не�кольких CD-ROMах. Е�ли выбранный\n"
 "пакет находит�� на другом CD-ROM, DrakX будет отдавать текущий CD и про�ить\n"
-"ва� в�тавить другой по мере надобно�ти. Е�ли у ва� нет требуемого CD под "
-"руками,\n"
+"ва� в�тавить другой по мере надобно�ти. Е�ли у ва� нет требуемого CD под руками,\n"
 "про�то нажмите \"%s\", тогда �оответ�твующие пакеты не будут у�танавливать��."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../help.pm:95
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
 "There are thousands of packages available for Mageia, and to make it\n"
@@ -272,9 +270,8 @@ msgstr ""
 "вашу �и�тему. С Mageia по�тавл�ют�� ты��чи пакетов и, дл� упрощени�\n"
 "выбора, они разбиты на группы.\n"
 "\n"
-"Пакеты �ортированы по группам, которые �оответ�твуют �пецифике\n"
-"и�пользовани� вашей машины. В Mageia пакеты �ортируют�� по четырем\n"
-"категори�м. Вы можете �мешивать и �очетать приложени� из различных\n"
+"В Mageia пакеты �ортируют�� по четырем категори�м.\n"
+"Вы можете �мешивать и �очетать приложени� из различных\n"
 "категорий, например, вариант у�тановки ``Рабоча� �танци�'' может иметь\n"
 "приложени� из категории ``Разработка''.\n"
 "\n"
@@ -283,7 +280,12 @@ msgstr ""
 "рабочей �танции.\n"
 "\n"
 " * \"%s\": е�ли вы �обираете�ь зан�ть�� программированием, выберите\n"
-"�оответ�твующие группы из �той категории.\n"
+"�оответ�твующие группы из �той категории. Специальна� группа\n"
+"\"LSB\" на�троит �и�тему таким образом, что она будет �одержать наиболее полную\n"
+"�пецификацию Стандартной базы Linux.\n"
+"   Выбор \"LSB\" группы обе�печит 100%%-LSB �овме�тимо�ть\n"
+"�и�темы. Однако, е�ли вы не выберете группу \"LSB\", вы в�ё ещё\n"
+"будете иметь �и�тему, котора� почти на 100%% LSB-�овме�тима.\n"
 "\n"
 " * \"%s\": е�ли ваша машина будет работать �ервером, выберите какие из\n"
 "ча�то и�пользуемых �лужб вы желаете у�тановить на нее.\n"
@@ -295,7 +297,7 @@ msgstr ""
 "При наведении кур�ора мыши на им� группы будет показывать�� короткое\n"
 "по��нение к данной группе.\n"
 "\n"
-"ы можете отметить пункт \"%s\", который очень полезен, е�ли вы хорошо\n"
+"Вы можете отметить пункт \"%s\", который очень полезен, е�ли вы хорошо\n"
 "знаете предлагаемые пакеты, или е�ли вы хотите иметь полный контроль над\n"
 "тем, что будет у�танавливать��.\n"
 "\n"
@@ -317,7 +319,8 @@ msgstr ""
 "Linux �и�темы. В �то варианте вы �можете работать только в режиме командной\n"
 "�троки. Общий размер �той у�тановки занимает 65 мегабайт."
 
-#: ../help.pm:149 ../help.pm:591
+#: ../help.pm:149
+#: ../help.pm:591
 #, c-format
 msgid "Upgrade"
 msgstr "Обновление"
@@ -335,7 +338,7 @@ msgstr "Сама� минимальна� у�тановка"
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../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"
@@ -352,8 +355,7 @@ msgid ""
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mageia was\n"
-"finalized. If you do not know what a particular service is supposed to do "
-"or\n"
+"finalized. If you do not know what a particular service is supposed to do or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
 "\n"
@@ -424,8 +426,7 @@ msgid ""
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you probably do not want to start any services which you do not "
-"need.\n"
+"server: you probably do not want to start any services which you do not need.\n"
 "Please remember that some services can be dangerous if they're enabled on a\n"
 "server. In general, select only those services you really need. !!"
 msgstr ""
@@ -480,7 +481,7 @@ msgstr ""
 #: ../help.pm:213
 #, c-format
 msgid "Hardware clock set to GMT"
-msgstr ""
+msgstr "�ппаратные ча�ы на�троены на врем� по Гринвичу"
 
 #: ../help.pm:213
 #, c-format
@@ -515,7 +516,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../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"
@@ -578,7 +579,9 @@ msgstr ""
 "WindowMaker, и т.д..), вход�щие в Mageia.\n"
 "\n"
 "Вам будет пред�тавлен �пи�ок различных параметров дл� получени�\n"
-"оптимального графиче�кого отображени�: Видеокарта\n"
+"оптимального графиче�кого отображени�.\n"
+"\n"
+"Видеокарта\n"
 "\n"
 "   Ин�талл�тор обычно автоматиче�ки определ�ет и на�траивает видеокарту,\n"
 "у�тановленную в вашей машине. Е�ли �то не так, вы можете выбрать в �том\n"
@@ -696,34 +699,34 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../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 drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -739,14 +742,13 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
-"this option. Be careful, because you will not be able to undo this "
-"operation\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
+"this option. Be careful, because you will not be able to undo this operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -808,7 +810,7 @@ msgstr ""
 "\n"
 " * \"%s\": �та опци� позволит про�то удалить в�ю информацию на ди�ке и\n"
 "начать �оздание разделов ди�ка на пу�том ме�те. В�� информаци� на вашем\n"
-"ди�ке будет утер�на.\n"
+"ди�ке будет утер�на. Эта опци� по�вл�ет��, е�ли же�ткий ди�к полно�тьюзан�т Microsoft Windows.\n"
 "\n"
 "   !! Е�ли вы выберете �ту опцию, в�е данные на вашем ди�ке будут потер�ны.\n"
 "!!\n"
@@ -829,7 +831,7 @@ msgstr "И�пользовать �уще�твующий раздел"
 #: ../help.pm:370
 #, c-format
 msgid "Use the free space on the Microsoft Windows® partition"
-msgstr ""
+msgstr "И�пользовать �вободное про�тран�тво на разделе Microsoft Windows®"
 
 #: ../help.pm:370
 #, c-format
@@ -913,22 +915,22 @@ msgstr "Создать диÑ�кету автоматичеÑ�кой уÑ�таноÐ
 #: ../help.pm:405
 #, c-format
 msgid "Replay"
-msgstr ""
+msgstr "Повторить"
 
 #: ../help.pm:405
 #, c-format
 msgid "Automated"
-msgstr ""
+msgstr "�втоматиче�ки"
 
 #: ../help.pm:405
 #, c-format
 msgid "Save packages selection"
-msgstr ""
+msgstr "Сохранить �пи�ок пакетов"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../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"
@@ -936,8 +938,7 @@ msgid ""
 "\n"
 "Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to "
-"reformat\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to reformat\n"
 "partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
 "Please be careful when selecting partitions. After the formatting is\n"
@@ -980,7 +981,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../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"
@@ -1009,7 +1010,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../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"
@@ -1032,9 +1033,9 @@ msgstr ""
 "\n"
 "Е�ли вы не знаете что выбрать, о�тавьте выбор по умолчанию. Вы �можете\n"
 "изменить �тот уровень безопа�но�ти потом � помощью утилиты draksec из\n"
-"Mageia Control Center.\n"
+"Центра управлени� Mageia.\n"
 "\n"
-"В поле \"%s\" �и�теме указывает�� пользователь, который будет отвечать за\n"
+"В поле \"%s\" �и�теме указывает�� пользователь (e-mail), который будет отвечать за\n"
 "безопа�но�ть. �а �тот адре� будут по�ылать�� �ообщени� по безопа�но�ти."
 
 #: ../help.pm:461
@@ -1045,24 +1046,24 @@ msgstr "�дмини�тратор по безопа�но�ти"
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1078,21 +1079,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1109,14 +1110,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Зде�ь вам предложат выбрать, какие разделы будут и�пользовать�� дл�\n"
 "у�тановки вашей �и�темы Mageia. Е�ли разделы были уже определены\n"
@@ -1133,7 +1128,7 @@ msgstr ""
 "\n"
 " * \"%s\": �та опци� удал�ет в�е разделы на выбранном же�тком ди�ке;\n"
 "\n"
-" * \"%s\": �та опци� позвол�ет автоматиче�ки �оздать ext3 и swap разделы на\n"
+" * \"%s\": �та опци� позвол�ет автоматиче�ки �оздать ext4 и swap разделы на\n"
 "�вободном про�тран�тве вашего же�ткого ди�ка.\n"
 "\n"
 "\"%s\": открывает до�туп к дополнительным возможно�т�м:\n"
@@ -1149,7 +1144,8 @@ msgstr ""
 "во��тановить, и�пользу� �ту опцию. Пожалуй�та, будьте о�торожны и помните,\n"
 "что �то может и не получить��.\n"
 "\n"
-" * \"%s\": отмен�ет в�е изменени� и загружает и�ходную таблицу разделов.\n"
+" * \"%s\": отмен�ет в�е изменени� и загружает и�ходную таблицу разделов,\n"
+"что была в оригинале на же�ткий ди�к.\n"
 "\n"
 " * \"%s\": е�ли не выбрать �ту опцию, то пользователи будут вынуждены\n"
 "вручную монтировать и размонтировать �ъемные но�ители типа ди�кет и\n"
@@ -1183,27 +1179,21 @@ msgstr ""
 "\n"
 "Чтобы получить информацию о различных до�тупных файловых �и�темах,\n"
 "пожалуй�та почитайте главу ext2FS из книги ``Справочное руковод�тво''.\n"
-"\n"
-"Е�ли вы производите ин�талл�цию на PPC машину, вам потребует�� �оздать\n"
-"маленький HFS ``bootstrap'' раздел, не больше 1MB, который будет\n"
-"и�пользовать�� загрузчиком yaboot. Е�ли вы решите �делать раздел чуть\n"
-"больше, �кажем 50MB, то вы найдете полезное ме�то дл� хранени� spare kernel\n"
-"и ramdisk образов дл� загрузки в аварийных �итуаци�х."
 
 #: ../help.pm:526
 #, c-format
 msgid "Save partition table"
-msgstr ""
+msgstr "Сохранить таблицу разделов"
 
 #: ../help.pm:526
 #, c-format
 msgid "Restore partition table"
-msgstr ""
+msgstr "Во��тановить таблицу разделов"
 
 #: ../help.pm:526
 #, c-format
 msgid "Rescue partition table"
-msgstr ""
+msgstr "И�править таблицу разделов"
 
 #: ../help.pm:526
 #, c-format
@@ -1213,12 +1203,12 @@ msgstr "�втомонтирование �ъемных но�ителей"
 #: ../help.pm:526
 #, c-format
 msgid "Wizard"
-msgstr ""
+msgstr "Ма�тер"
 
 #: ../help.pm:526
 #, c-format
 msgid "Undo"
-msgstr ""
+msgstr "Вернуть"
 
 #: ../help.pm:526
 #, c-format
@@ -1228,36 +1218,36 @@ msgstr "Переключение между нормальным/Ñ�кÑ�пертÐ
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../help.pm:536
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "�а вашем же�том ди�ке обнаружено не�колько разделов Microsoft. Выберите\n"
@@ -1295,8 +1285,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\"%s\": check the current country selection. If you're not in this country,\n"
-"click on the \"%s\" button and choose another. If your country is not in "
-"the\n"
+"click on the \"%s\" button and choose another. If your country is not in the\n"
 "list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 "\"%s\": проверьте текущий выбор �траны Е�ли вы находите�ь не в �той �тране,\n"
@@ -1307,7 +1296,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../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"
@@ -1318,8 +1307,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1394,7 +1383,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../help.pm:612
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1436,6 +1425,7 @@ msgid ""
 "by the entire system. Running the command as a regular user will only\n"
 "change the language settings for that particular user."
 msgstr ""
+"Первый шаг - выбор вашего предпочитаемого �зыка.\n"
 "Ваш выбор предпочитаемого �зыка повли�ет на �зык документации, �ам\n"
 "ин�талл�тор и �и�тему в целом. Выберите �начала регион, в котором вы\n"
 "находите�ь, затем �зык на котором вы говорите.\n"
@@ -1446,7 +1436,7 @@ msgstr ""
 "�апример, е�ли у ва� в �и�теме будут работать пользователи из И�пании,\n"
 "выберите в дереве English как о�новной, и \"%s\" в дополнительном разделе.\n"
 "\n"
-"О поддержке UTF-8 (unicode): Unicode �то нова� кодировка, котора� включает\n"
+"О поддержке UTF-8 (unicode): Unicode - �то нова� кодировка, котора� включает\n"
 "в �еб� в�е �уще�твующие �зыки. Однако ее полна� поддержка в GNU/Linux пока\n"
 "находит�� в �тадии разработки. По�тому Mageia будет определ�ть\n"
 "и�пользовать ее или нет в зави�имо�ти от выбора пользовател�:\n"
@@ -1470,7 +1460,7 @@ msgstr ""
 "шрифтов, проверку орфографии и т.д. дл� у�тановленных �зыков.\n"
 "\n"
 "Дл� переключени� между различными у�тановленными �зыками в вашей �и�теме вы\n"
-"можете запу�кать команду \"/usr/sbin/localedrake\" � правами \"root\",\n"
+"можете запу�кать команду \"localedrake\" � правами \"root\",\n"
 "чтобы изменить �зык дл� в�ей �и�темы. Запу�к �той команды � правами\n"
 "обычного пользовател� позволит изменить на�тройки �зыка дл� данного\n"
 "конкретного пользовател�."
@@ -1483,7 +1473,7 @@ msgstr "И�пан�кий"
 #: ../help.pm:643
 #, c-format
 msgid "Use Unicode by default"
-msgstr ""
+msgstr "И�пользовать Unicode по умолчанию"
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
@@ -1538,8 +1528,7 @@ msgstr ""
 "Е�ли, по каким-либо причинам, вы желаете указать другой тип мыши, выберите\n"
 "нужную мышь из предо�тавленного �пи�ка.\n"
 "\n"
-"Вы можете выбрать пункт \"%s\" дл� выбора типа мыши ``generic'', который "
-"будет\n"
+"Вы можете выбрать пункт \"%s\" дл� выбора типа мыши ``generic'', который будет\n"
 "работать практиче�ки � любой мышью.\n"
 "\n"
 "Е�ли вы выбираете другую мышь, отличную от выбранной по умолчанию, по�вит��\n"
@@ -1594,10 +1583,9 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
-"Choosing \"%s\" will not install any boot loader. Use this option only if "
-"you\n"
+"Choosing \"%s\" will not install any boot loader. Use this option only if you\n"
 "know what you're doing."
 msgstr ""
 "LILO и GRUB -- �то начальные загрузчики GNU/Linux. Этот шаг обычно\n"
@@ -1618,7 +1606,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../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"
@@ -1645,9 +1633,8 @@ msgid ""
 "system you may change it by running PrinterDrake from the Mageia\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
-"Теперь пришло врем� выбрать �и�тему печати дл� вашего компьютера. Другие OS\n"
-"могут предложить вам одну, а Mageia предлагает две. Кажда� из "
-"�и�тем\n"
+"Теперь пришло врем� выбрать �и�тему печати дл� вашего компьютера. Другие ОС\n"
+"могут предложить вам одну, а Mageia предлагает две. Кажда� из �и�тем\n"
 "�вл�ет�� лучшей дл� определенной конфигурации.\n"
 "\n"
 " * \"%s\" -- что означает ``печатать, не �тавить в очередь'' (``print,\n"
@@ -1670,7 +1657,7 @@ msgstr ""
 "\n"
 "Е�ли вы �делаете �вой выбор �ейча�, а позже обнаружите, что �и�тема печати\n"
 "вам не подходит, вы �можете изменить ее, запу�тив PrinterDrake из Центра\n"
-"Управлени� Mageia и нажав на кнопку  \"%s\"."
+"управлени� Mageia и нажав на кнопку  \"%s\"."
 
 #: ../help.pm:768
 #, c-format
@@ -1680,7 +1667,7 @@ msgstr "pdq"
 #: ../help.pm:724
 #, c-format
 msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
 
 #: ../help.pm:724
 #, c-format
@@ -1697,7 +1684,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1743,7 +1730,7 @@ msgstr ""
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../help.pm:794
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "As a review, DrakX will present a summary of information it has gathered\n"
 "about your system. Depending on the hardware installed on your machine, you\n"
@@ -1828,11 +1815,6 @@ msgstr ""
 " * \"%s\": проверьте текущую конфигурацию мыши и нажмите на кнопку, е�ли\n"
 "необходимо что-либо изменить.\n"
 "\n"
-" * \"%s\": по нажатию на кнопку \"%s\" откроет�� ма�тер на�тройки принтера.\n"
-"Прочитайте �оответ�твующую главу в книге ``Стартовое руковод�тво\n"
-"пользовател�'', чтобы узнать как у�тановить новый принтер. Пред�тавленный\n"
-"там интерфей� подобен и�пользуемому в проце��е у�тановки.\n"
-"\n"
 " * \"%s\": е�ли в вашей �и�теме найдена звукова� карта, зде�ь �то будет\n"
 "показано. Е�ли вы увидите, что показанна� звукова� карта не �оответ�твует\n"
 "тому, что у ва� реально е�ть в �и�теме, вы можете нажать на кнопку и\n"
@@ -1875,9 +1857,9 @@ msgstr ""
 "у�тановки."
 
 #: ../help.pm:809
-#, fuzzy, c-format
+#, c-format
 msgid "TV card"
-msgstr "карта ISDN"
+msgstr "TV-карта"
 
 #: ../help.pm:809
 #, c-format
@@ -1892,9 +1874,9 @@ msgstr "Графиче�кий Интерфей�"
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
 #: ../help.pm:861
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1908,12 +1890,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "�ажмите \"%s\", е�ли вы хотите удалить в�е данные и разделы на данном\n"
 "же�тком ди�ке. Будьте о�торожны, потому что по�ле нажати� \"%s\" вы не\n"
@@ -1933,120 +1915,3 @@ msgstr "Далее ->"
 msgid "<- Previous"
 msgstr "<- �азад"
 
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
-#~ msgid ""
-#~ "\"%s\": clicking on the \"%s\" button will open the printer "
-#~ "configuration\n"
-#~ "wizard. Consult the corresponding chapter of the ``Starter Guide'' for "
-#~ "more\n"
-#~ "information on how to set up a new printer. The interface presented in "
-#~ "our\n"
-#~ "manual is similar to the one used during installation."
-#~ msgstr ""
-#~ "\"%s\": по нажатию на кнопку \"%s\" откроет�� ма�тер на�тройки принтера.\n"
-#~ "Прочитайте �оответ�твующую главу в книге ``Стартовое руковод�тво\n"
-#~ "пользовател�'', чтобы узнать как у�тановить новый принтер. "
-#~ "Пред�тавленный\n"
-#~ "там интерфей� подобен и�пользуемому в проце��е у�тановки."
-
-# DO NOT BOTHER TO MODIFY HERE, SEE:
-# cvs.mandriva.com:/cooker/doc/manualB/modules/ru/drakx-chapter.xml
-#~ msgid ""
-#~ "This is the most crucial decision point for the security of your GNU/"
-#~ "Linux\n"
-#~ "system: you must enter the \"root\" password. \"Root\" is the system\n"
-#~ "administrator and is the only user authorized to make updates, add "
-#~ "users,\n"
-#~ "change the overall system configuration, and so on. In short, \"root\" "
-#~ "can\n"
-#~ "do everything! That's why you must choose a password which is difficult "
-#~ "to\n"
-#~ "guess: DrakX will tell you if the password you chose is too simple. As "
-#~ "you\n"
-#~ "can see, you're not forced to enter a password, but we strongly advise\n"
-#~ "against this. GNU/Linux is just as prone to operator error as any other\n"
-#~ "operating system. Since \"root\" can overcome all limitations and\n"
-#~ "unintentionally erase all data on partitions by carelessly accessing the\n"
-#~ "partitions themselves, it is important that it be difficult to become\n"
-#~ "\"root\".\n"
-#~ "\n"
-#~ "The password should be a mixture of alphanumeric characters and at least "
-#~ "8\n"
-#~ "characters long. Never write down the \"root\" password -- it makes it "
-#~ "far\n"
-#~ "too easy to compromise your system.\n"
-#~ "\n"
-#~ "One caveat: do not make the password too long or too complicated because "
-#~ "you\n"
-#~ "must be able to remember it!\n"
-#~ "\n"
-#~ "The password will not be displayed on screen as you type it. To reduce "
-#~ "the\n"
-#~ "chance of a blind typing error you'll need to enter the password twice. "
-#~ "If\n"
-#~ "you do happen to make the same typing error twice, you'll have to use "
-#~ "this\n"
-#~ "``incorrect'' password the first time you'll try to connect as \"root\".\n"
-#~ "\n"
-#~ "If you want an authentication server to control access to your computer,\n"
-#~ "click on the \"%s\" button.\n"
-#~ "\n"
-#~ "If your network uses either LDAP, NIS, or PDC Windows Domain "
-#~ "authentication\n"
-#~ "services, select the appropriate one for \"%s\". If you do not know "
-#~ "which\n"
-#~ "one to use, you should ask your network administrator.\n"
-#~ "\n"
-#~ "If you happen to have problems with remembering passwords, or if your\n"
-#~ "computer will never be connected to the Internet and you absolutely "
-#~ "trust\n"
-#~ "everybody who uses your computer, you can choose to have \"%s\"."
-#~ msgstr ""
-#~ "Это �амое важное решение в деле безопа�но�ти вашей �и�темы GNU/Linux: вы\n"
-#~ "должны вве�ти пароль \"root\". \"Root\" �вл�ет�� админи�тратором �и�темы, "
-#~ "и\n"
-#~ "только он имеет право производить обновлени�, добавл�ть пользователей,\n"
-#~ "измен�ть конфигурацию �и�темы и так далее. Короче говор�, \"root\" может\n"
-#~ "в�е! Вот по�тому вы должны придумать пароль, который трудно подобрать -\n"
-#~ "DrakX �ообщит вам, е�ли пароль �лишком про�т. Как вы видите, можно "
-#~ "вообще\n"
-#~ "не вводить пароль, но мы �ерьезно �оветуем вам �того не делать по одной\n"
-#~ "про�той причине: не думайте, что е�ли вы загрузили GNU/Linux, то ваши\n"
-#~ "о�тальные операционные �и�темы защищены от ошибок. Так как \"root\" "
-#~ "может\n"
-#~ "пере�тупить в�е ограничени� и непреднамеренно �тереть в�е данные на\n"
-#~ "разделах ди�ка, обраща��ь небрежно � разделами, то очень важно, чтобы "
-#~ "�тать\n"
-#~ "\"root\" было трудно.\n"
-#~ "\n"
-#~ "Пароль должен быть �очетанием цифровых и буквенных �имволов и иметь "
-#~ "длину\n"
-#~ "не менее 8 �имволов. �икогда не запи�ывайте пароль \"root\" - �то делает\n"
-#~ "очень легкой возможно�ть �компрометировать �и�тему.\n"
-#~ "\n"
-#~ "Одно предо�тережение -- не делайте пароль �лишком длинным или �лишком\n"
-#~ "�ложным, потому что вы должны его без о�обых у�илий запомнить!\n"
-#~ "\n"
-#~ "Пароль не будет отображать�� на �кране так же, как вы его вводите. Кроме\n"
-#~ "того, вам прийдет�� повторить ввод парол�, чтобы предупредить "
-#~ "возможно�ть\n"
-#~ "опечатки. Е�ли �лучит�� так, что вы опечатали�ь дважды, тогда �тот\n"
-#~ "``неверный'' пароль прийдет�� и�пользовать при первой загрузке.\n"
-#~ "\n"
-#~ "Е�ли вы желаете, чтобы до�туп к �тому компьютеру контролировал�� "
-#~ "�ервером\n"
-#~ "аутентификации, нажмите на кнопку \"%s\".\n"
-#~ "\n"
-#~ "Е�ли ваша �еть и�пользует �лужбы аутентификации LDAP, NIS или PDC "
-#~ "Windows\n"
-#~ "Domain выберите �оответ�твующий тип \"%s\". Е�ли не знаете что выбрать,\n"
-#~ "�про�ите �воего админи�тратора �ети.\n"
-#~ "\n"
-#~ "Е�ли у ва� возникли проблемы � запоминанием паролей, вы можете выбрать\n"
-#~ "опцию \"%s\", е�ли ваш компьютер не будет подключать�� к Интернет и е�ли "
-#~ "вы\n"
-#~ "довер�ете в�ем до�туп к �воей машине."
-
-#~ msgid "authentication"
-#~ msgstr "аутентификаци�"
diff --git a/perl-install/install/help/po/sc.po b/perl-install/install/help/po/sc.po
index d972d89ac..e23d39d6d 100644
--- a/perl-install/install/help/po/sc.po
+++ b/perl-install/install/help/po/sc.po
@@ -84,7 +84,7 @@ msgstr "Bolis a tenni custa possibilidadi?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -94,24 +94,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -408,31 +408,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -448,14 +448,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -612,19 +612,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -640,21 +640,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -671,14 +671,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -719,34 +713,34 @@ msgstr ""
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -771,8 +765,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -927,7 +921,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -986,7 +980,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1090,7 +1084,7 @@ msgstr "Interfaci Gràfiga"
 #: ../help.pm:861
 #, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1099,12 +1093,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 
 #: ../help.pm:872
diff --git a/perl-install/install/help/po/sk.po b/perl-install/install/help/po/sk.po
index ae4267e83..8289d938a 100644
--- a/perl-install/install/help/po/sk.po
+++ b/perl-install/install/help/po/sk.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2005-09-21 14:03+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 "Language-Team:  <i18n@mandrake.sk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,7 +131,8 @@ msgstr "Chcete použiť túto možnosť?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -140,24 +142,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Tu je zoznam oblastí s existujúcimi Linux oddielmi, ktoré boli zdetekované\n"
@@ -201,8 +207,7 @@ msgid ""
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Inštalácia Mageiau je distribuovaná na viacerých CD-ROM diskoch. "
-"DrakX\n"
+"Inštalácia Mageiau je distribuovaná na viacerých CD-ROM diskoch. DrakX\n"
 "vie zistiť, ak je vybraný balík umiestnený na inom CD-ROM disku, vysunie\n"
 "aktuálne CD a vypýta si od vás to ktoré je práve potrebné. Ak toto CD "
 "nemáte, kliknite na \"%s\" a požadovaný balík nebude nainštalovaný."
@@ -266,8 +271,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Teraz je možné vybrať, ktoré programy chcete nainštalovať na váš systém.\n"
-"Mageia obsahuje tisíce bal�kov s programami. Pre jednoduchšiu "
-"orientáciu\n"
+"Mageia obsahuje tisíce bal�kov s programami. Pre jednoduchšiu orientáciu\n"
 "boly rozdelené do skupín, ktoré združujú podobné aplikácie.\n"
 "\n"
 "Balí�ky sú rozdelené do skupín, ktoré zodpovedajú tomu, ako ich "
@@ -384,13 +388,11 @@ msgstr ""
 "\n"
 "!! Ak boli vybrané balíky, ktoré sú ur�ené pre server, bu� zámerne alebo\n"
 "preto že sú sú�asťou celej skupiny, budete musieť potvrdiť, �i skuto�ne\n"
-"chcete tieto služby nainštalovať. V prípade Mageiau, sú štandardne "
-"všetky\n"
+"chcete tieto služby nainštalovať. V prípade Mageiau, sú štandardne všetky\n"
 "nainštalované služby spúšťané pri štarte systému. Aj ke� sú bezpe�né\n"
 "a v �ase ke� bola distribúcia vydaná neobsahovali žiadne známe problémy\n"
 "je možné, že tieto bezpe�nostné problémy budú odhalené až po dokon�ení\n"
-"tejto verzie Mageiau. Ak neviete �o jednotlivé servisy znamenajú, "
-"alebo\n"
+"tejto verzie Mageiau. Ak neviete �o jednotlivé servisy znamenajú, alebo\n"
 "pre�o boli nainštalované tak kliknite na \"%s\". Kliknutím na \"%s\" budú\n"
 "vypísané služby nainštalované a automaticky naštartované pri spustení\n"
 "systému. !!\n"
@@ -709,31 +711,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -749,14 +755,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1074,19 +1081,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1102,21 +1112,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1133,14 +1145,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Na tomto mieste je potrebné aby ste si vybrali oblasti, ktoré budú použité\n"
 "na inštaláciu Mageiau. Ak už boli oddiely definované,\n"
@@ -1158,7 +1164,7 @@ msgstr ""
 " * \"%s\": táto voľba vymaže všetky oblasti na vybranom pevnom\n"
 "disku\n"
 "\n"
-" * \"%s\": táto voľba umožní automatické vytvorenie ext3\n"
+" * \"%s\": táto voľba umožní automatické vytvorenie ext4\n"
 "a swap oblasti na voľnom mieste vášho disku\n"
 "\n"
 " * \"%s\": získate prístup k rozšíreným možnostiam:\n"
@@ -1217,13 +1223,6 @@ msgstr ""
 "Pre získanie informácií o iných súborových systémoch, ktoré sú dostupné, "
 "pre�ítajte\n"
 "si ext2FS kapitolu z ``Referen�nej príru�ky''.\n"
-"\n"
-"Ak prevádzate inštaláciu na PPC hardvéri, budete zrejme chcieť vytvoriť malý "
-"HFS\n"
-"``bootstrap'' oddiel veľký aspoň 1MB, ktorý bude môcť používať yaboot\n"
-"zavádza�. Ak sa rozhodnete vytvoriť tento oddiel vä�ší, povedzme 50MB, môže\n"
-"to byť vhodné miesto pre uloženie jadra a obrazov ramdisku pre výnimo�né\n"
-"situácie, ktoré môžu nastať."
 
 #: ../help.pm:526
 #, c-format
@@ -1263,34 +1262,40 @@ msgstr "Prepnúť medzi normálnym/expertným režimom"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Bol nájdený viac ako jeden Microsoft oddiel na vašom pevnom disku.\n"
@@ -1349,8 +1354,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1383,8 +1389,7 @@ msgstr ""
 "inštalácie ostanú dostupné, podobne ako pri štandardnej inštalácii.\n"
 "\n"
 "Použitie voľby ``Aktualizácia'' by malo fungovať správne pre systémy\n"
-"Mageia \"8.1\" a novšie. Vykonanie Aktualizácie pre staršie verzie "
-"ako\n"
+"Mageia \"8.1\" a novšie. Vykonanie Aktualizácie pre staršie verzie ako\n"
 "\"8.1\" nie je odporú�ané.\""
 
 #: ../help.pm:594
@@ -1620,7 +1625,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1672,8 +1677,7 @@ msgid ""
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Teraz nastal �as výberu tla�ového systému pre váš po�íta�. Iné opera�né\n"
-"systémy vám poskytujú zvy�ajne iba jediný, Mageia vám poskytuje "
-"dva.\n"
+"systémy vám poskytujú zvy�ajne iba jediný, Mageia vám poskytuje dva.\n"
 "Kazdý z nich je vhodný pre iný typ konfigurácie.\n"
 "\n"
 " * \"%s\" - �o znamená ``tla�iť, neukladať do fronty'', je vhodný výber ak\n"
@@ -1722,7 +1726,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1873,8 +1877,7 @@ msgstr ""
 " * \"%s\": ak si teraz želáte nastaviť vaše Internetové pripojenie\n"
 "alebo prístup do lokálnej siete. Prezrite si tla�enú dokumentáciu alebo "
 "použite\n"
-"Kontrolné centrum Mageia ak už bude inštalácia ukon�ená aby ste "
-"mali\n"
+"Kontrolné centrum Mageia ak už bude inštalácia ukon�ená aby ste mali\n"
 "prístup k dokumentácii.\n"
 " * \"%s\": vám umožní nastaviť HTTP alebo FTP proxy ak je po�íta�\n"
 "umiestnený za proxy serverom.\n"
@@ -1914,7 +1917,7 @@ msgstr "Grafické rozhranie"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1926,12 +1929,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Kliknite na \"%s\" ak si želáte vymazať všetky údaje a oblasti ktoré\n"
 "sa nachádzajú na vašom pevnom disku. Bu�te opatrní, po kliknutí na\n"
diff --git a/perl-install/install/help/po/sl.po b/perl-install/install/help/po/sl.po
index 5c758bf50..71e2dd797 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"
@@ -137,7 +138,7 @@ msgstr "Ali želite uporabiti to možnost?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -147,24 +148,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Na seznamu so razdelki za Linux, ki jih je �arovnik zaznal na vašem\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,34 +697,34 @@ 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 drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -739,14 +740,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\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,24 +1034,24 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1066,21 +1067,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1097,14 +1098,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Izbrati morate razdelke, na katere boste namestili sistem\n"
 "Mageia. Če ste razdelke že izbrali ob kakšni predhodni\n"
@@ -1120,7 +1115,7 @@ msgstr ""
 "\n"
 " * »%s«: brisanje vseh razdelkov na izbranem disku\n"
 "\n"
-" * »%s«: samodejno ustvarjanje ext3 in izmenjalnih (swap) razdelkov\n"
+" * »%s«: samodejno ustvarjanje ext4 in izmenjalnih (swap) razdelkov\n"
 "na prostem delu vašega trdega diska.\n"
 "\n"
 "»%s«: dostop do dodatnih možnosti:\n"
@@ -1169,12 +1164,6 @@ msgstr ""
 "\n"
 "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"
-"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"
-"potrebne datoteke za zasilni zagon sistema."
 
 #: ../help.pm:526
 #, c-format
@@ -1212,36 +1201,36 @@ 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 drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Na vašem trdem disku je ve� kot en razdelek za Windows.\n"
@@ -1287,7 +1276,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"
@@ -1298,8 +1287,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1367,7 +1356,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"
@@ -1560,7 +1549,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1584,7 +1573,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"
@@ -1662,7 +1651,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1841,15 +1830,15 @@ msgid "Graphical Interface"
 msgstr "Grafi�na kartica"
 
 #: ../help.pm:861
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 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!"
 
@@ -1857,12 +1846,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Če želite izbrisati vse razdelke na tem disku in vse podatke na njih,\n"
 "kliknite na »%s« Pazite, po tem, ko boste kliknili »%s«, razdelkov\n"
diff --git a/perl-install/install/help/po/sq.po b/perl-install/install/help/po/sq.po
index 39ce8edd1..d87248cd2 100644
--- a/perl-install/install/help/po/sq.po
+++ b/perl-install/install/help/po/sq.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2004-09-15 13:33+0200\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -132,7 +133,8 @@ msgstr "A dëshironi ta përdorni këtë veçori?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -142,24 +144,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Lista e lartë shënuar identifikon ndrajet Linux të zbuluara në\n"
@@ -204,8 +210,7 @@ msgid ""
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Pakot e nevojshme për Instalimin e Mageia janë të shpërndara në "
-"shumë\n"
+"Pakot e nevojshme për Instalimin e Mageia janë të shpërndara në shumë\n"
 "CDROM-e. Fatëmirësisht, DrakX i njef të gjitha lokacinet e pakove në CDROM-"
 "e.\n"
 "Ai do ta qetë jashtë CD-në që gjindet në lexuesin e CD-ve, dhe juve do të "
@@ -706,31 +711,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -746,14 +755,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1051,19 +1061,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1079,21 +1092,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1110,14 +1125,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Në këtë etapë ju duhet të zgjedhni se cila(t) ndarje(t) do të përdoret(n)\n"
 "për sistemin tuaj Mageia. Nëse ndarja e diskut është bërë më heret,\n"
@@ -1136,7 +1145,7 @@ msgstr ""
 " * \"%s\": ky opcion do të zhduk, të gjitha ndarjet në diskun e zgjedhur\n"
 "\n"
 " * \"%s\": ky opcion mundëson krijimin e një sistemi të skedareve\n"
-"ext3 dhe swap të ndarjeve, në hapësirën e lirë të diskut tuaja\n"
+"ext4 dhe swap të ndarjeve, në hapësirën e lirë të diskut tuaja\n"
 "\n"
 "\"%s\": mundëson hyrjen në fonksionimin e llogarive:\n"
 "\n"
@@ -1186,13 +1195,6 @@ msgstr ""
 "\n"
 "Për të përfituar më shumë informacione mbi sistemet e skedareve, lexoni mbi\n"
 "sistemin e skedareve ext2FS në ``Doracakun referues''.\n"
-"\n"
-"Nëse ju jeni duke instaluar një stacion PPC, ju duhet të krijoni një ndarje\n"
-"të vogël HFS ``bootstrap'' më së paku 1MB, e cila do të përdoret nga "
-"bootloader\n"
-"yaboot. Nëse dëshironi të bëni një ndarje më të madhe, p.sh 50MB, ju duhet\n"
-"të gjeni një vegël për të vendosur bërthamat dhe imazhet ramdisk hyrëse në\n"
-"rastë të ndonji problemi."
 
 #: ../help.pm:526
 #, c-format
@@ -1232,34 +1234,40 @@ msgstr "Kalo mes modit normal/ekspert"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Janë gjetur më shumë se një ndarje Windows në diskun tuaj të fort, ju\n"
@@ -1318,8 +1326,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1354,8 +1363,7 @@ msgstr ""
 "Duke përdorur mundësinë ``Azhurno'' duhet të funksionoj shumë mirë në "
 "sistemin\n"
 "Mageia ndër versionin \"8.1\" apo më të ri. Tentimi i Azhurnimit të\n"
-"një versioni më të vjetër se versioni Mageia \"8.1\" nuk "
-"rekomandohet."
+"një versioni më të vjetër se versioni Mageia \"8.1\" nuk rekomandohet."
 
 #: ../help.pm:594
 #, fuzzy, c-format
@@ -1566,7 +1574,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1668,7 +1676,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1856,11 +1864,11 @@ msgstr "Interfac Grafikë"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
-"Zgjedheni diskun e fort (hard drive) që dëshironi ta zhdukni, për të\n"
+"Zgjedheni diskun e fort (hard disk drive) që dëshironi ta zhdukni, për të\n"
 "instaluar një ndarje të re Mageia. Keni kujDES, të gjitha të dhënat\n"
 "do të zhduken, dhe nuk mund të rekuperohen!"
 
@@ -1868,12 +1876,14 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Klikoni mbi \"%s\" nëse ju dëshironi ti zhdukni të dhënat dhe ndarjet në\n"
 "diskun tuaj të fort. Keni kujDES, mbasi që të klikoni mbi \"%s\", ju nuk\n"
diff --git a/perl-install/install/help/po/sr.po b/perl-install/install/help/po/sr.po
index 32204048e..0db2cff06 100644
--- a/perl-install/install/help/po/sr.po
+++ b/perl-install/install/help/po/sr.po
@@ -136,7 +136,7 @@ msgstr "Да ли желите да кори�тите ову опцију ?"
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -146,24 +146,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Изнад �е налази ли�та по�тојећих Linux партиција које �у детектоване\n"
@@ -710,31 +710,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -750,14 +750,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1090,19 +1090,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1118,21 +1118,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1149,14 +1149,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "�а овој тачки, морате избрати коју партицију(e) желите да кори�тите за\n"
 "ин�талацију новог Mageia �и�тема. Уколико �у партиције\n"
@@ -1223,13 +1217,6 @@ msgstr ""
 "Да би добили информације о различитим до�тупним типовима �и�тема, "
 "прочитајте\n"
 "ext2FS поглавље из ``Упу�тва''.\n"
-"\n"
-"Уколико радите ин�талацију на PPC Машину, можда ћете желети да креирате "
-"малу\n"
-"HFS 'bootstrap' партицију од најмање 1MB за употребу\n"
-"yaboot �тартера. Уколико �е двоумите да ову партицију направите мало већом,\n"
-"на пример 50MB, можете и�кори�тити тај про�тор за �мештање\n"
-"резервног кернела и ramdisk image за �тартање у хитним �итуацијама."
 
 #: ../help.pm:526
 #, c-format
@@ -1269,34 +1256,34 @@ msgstr "Пређи на нормални мод"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Једна или више Microsoft Windows партиција је детектовано \n"
@@ -1354,8 +1341,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1602,7 +1589,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1688,7 +1675,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1827,7 +1814,7 @@ msgstr "Графички интерфеј�"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1840,12 +1827,12 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Кликните на \"Следеће ->\" уколико желите да избришете �ве податке и \n"
 "партиције на овом хард ди�ку.Будите пажљиви, по�ле клика на \"У реду\", ви\n"
diff --git a/perl-install/install/help/po/sr@Latn.po b/perl-install/install/help/po/sr@Latn.po
index 281a317e6..2a825542d 100644
--- a/perl-install/install/help/po/sr@Latn.po
+++ b/perl-install/install/help/po/sr@Latn.po
@@ -138,7 +138,7 @@ msgstr "Da li želite da koristite ovu opciju ?"
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -148,24 +148,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Iznad se nalazi lista postojećih Linux particija koje su detektovane\n"
@@ -712,31 +712,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -752,14 +752,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1093,19 +1093,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1121,21 +1121,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1152,14 +1152,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Na ovoj ta�ki, morate izbrati koju particiju(e) želite da koristite za\n"
 "instalaciju novog Mageia sistema. Ukoliko su particije\n"
@@ -1228,13 +1222,6 @@ msgstr ""
 "Da bi dobili informacije o razli�itim dostupnim tipovima sistema, "
 "pro�itajte\n"
 "ext2FS poglavlje iz ``Upustva''.\n"
-"\n"
-"Ukoliko radite instalaciju na PPC Mašinu, možda ćete želeti da kreirate "
-"malu\n"
-"HFS 'bootstrap' particiju od najmanje 1MB za upotrebu\n"
-"yaboot startera. Ukoliko se dvoumite da ovu particiju napravite malo većom,\n"
-"na primer 50MB, možete iskoristiti taj prostor za smeštanje\n"
-"rezervnog kernela i ramdisk image za startanje u hitnim situacijama."
 
 #: ../help.pm:526
 #, c-format
@@ -1274,34 +1261,34 @@ msgstr "Pređi na normalni mod"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Jedna ili više Microsoft Windows particija je detektovano \n"
@@ -1359,8 +1346,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1607,7 +1594,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1695,7 +1682,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1834,7 +1821,7 @@ msgstr "Grafi�ki interfejs"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1847,12 +1834,12 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Kliknite na \"Sledeće ->\" ukoliko želite da izbrišete sve podatke i \n"
 "particije na ovom hard disku.Budite pažljivi, posle klika na \"U redu\", vi\n"
diff --git a/perl-install/install/help/po/sv.po b/perl-install/install/help/po/sv.po
index ec3091fa8..0ad58b468 100644
--- a/perl-install/install/help/po/sv.po
+++ b/perl-install/install/help/po/sv.po
@@ -9,15 +9,17 @@
 # Magnus Björklöf <bjorklof@nic.fi>, 2003.
 # Lars Westergren <lars.westergren@home.se>, 2003, 2004, 2005.
 # Thomas Backlund <tmb@mandriva.org>, 2004, 2005.
+# Thomas Backlund <tmb@mageia.org>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-sv - Mandriva 2006 Release\n"
+"Project-Id-Version: DrakX-sv\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-12 12:22+0200\n"
-"PO-Revision-Date: 2005-09-18 21:42+0300\n"
-"Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
+"PO-Revision-Date: 2011-05-24 21:52+0200\n"
+"Last-Translator: Thomas Backlund <tmb@mageia.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +27,7 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 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"
@@ -120,12 +122,12 @@ msgstr ""
 #: ../help.pm:54
 #, c-format
 msgid "User name"
-msgstr ""
+msgstr "Användarnamn"
 
 #: ../help.pm:54
 #, c-format
 msgid "Accept user"
-msgstr ""
+msgstr "Acceptera användare"
 
 #: ../help.pm:54
 #, c-format
@@ -135,7 +137,8 @@ msgstr "Vill du använda den här funktionen?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -145,24 +148,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Listat ovan är de existerande Linux-partitionerna som hittats på\n"
@@ -197,7 +204,7 @@ msgstr ""
 "\"andra lägsta SCSI-ID\", etc."
 
 #: ../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"
@@ -212,7 +219,7 @@ msgstr ""
 "installationen av motsvarande paket över."
 
 #: ../help.pm:95
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
 "There are thousands of packages available for Mageia, and to make it\n"
@@ -348,7 +355,7 @@ msgid "Truly minimal install"
 msgstr "Extremt minimal installation"
 
 #: ../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"
@@ -412,9 +419,8 @@ msgstr ""
 "om du har ett antal datorer som skall ha en identisk konfiguration.\n"
 "När du klickar på den ikonen kommer du att bli ombedd om att stoppa i\n"
 "en diskett som du tidigare skapat vid slutet av en annan\n"
-" installation. Se det andra tipset i det sista steget hur du gör för att "
-"skapa\n"
-" en sådan diskett."
+"installation. Se det andra tipset i det sista steget hur du gör för att\n"
+"skapa en sådan diskett."
 
 #: ../help.pm:183
 #, c-format
@@ -489,7 +495,7 @@ msgstr ""
 #: ../help.pm:213
 #, c-format
 msgid "Hardware clock set to GMT"
-msgstr ""
+msgstr "HÃ¥rdvaruklocka satt till GMT"
 
 #: ../help.pm:213
 #, c-format
@@ -520,7 +526,7 @@ msgstr ""
 "behov. "
 
 #: ../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"
@@ -701,34 +707,38 @@ msgstr ""
 "konfigurera bildskärmen korrekt."
 
 #: ../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 drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -744,14 +754,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -834,7 +845,7 @@ msgstr "Använd existerande partition"
 #: ../help.pm:370
 #, c-format
 msgid "Use the free space on the Microsoft Windows® partition"
-msgstr ""
+msgstr "Använd ledigt utrymme på Microsoft Windows® partitionen"
 
 #: ../help.pm:370
 #, c-format
@@ -918,20 +929,20 @@ msgstr "Generera automatisk installationsdiskett"
 #: ../help.pm:405
 #, c-format
 msgid "Replay"
-msgstr ""
+msgstr "Spela igen"
 
 #: ../help.pm:405
 #, c-format
 msgid "Automated"
-msgstr ""
+msgstr "Automatiserad"
 
 #: ../help.pm:405
 #, c-format
 msgid "Save packages selection"
-msgstr ""
+msgstr "Spara paketval"
 
 #: ../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"
@@ -978,7 +989,7 @@ msgstr ""
 "efter felaktiga block."
 
 #: ../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"
@@ -1007,7 +1018,7 @@ msgstr ""
 " avbryta."
 
 #: ../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"
@@ -1041,24 +1052,27 @@ msgid "Security Administrator"
 msgstr "Säkerhetsadministratör"
 
 #: ../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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1074,21 +1088,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1105,14 +1121,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Nu måste du välja vilka partitioner som ska användas för installationen av\n"
 "Mageia-systemet. Om partitioner redan har definierats, antingen\n"
@@ -1181,26 +1191,21 @@ msgstr ""
 "\n"
 "För att få information om de olika typerna av filsystem, läs kapitlet\n"
 "ext2FS i \"Reference Manual\".\n"
-"\n"
-"Om du installerar på en PPC-dator bör du skapa en en liten HFS-\n"
-"partition (\"bootstrap\") på åtminstone 1 MB. Den kommer att användas av\n"
-"starthanteraren Yaboot. Om du gör partitionen lite större, t ex 50 MB,\n"
-"har du ett bra ställe att lagra en reservkärna och ramdiskar för nödlägen."
 
 #: ../help.pm:526
 #, c-format
 msgid "Save partition table"
-msgstr ""
+msgstr "Spara partitionstabellen"
 
 #: ../help.pm:526
 #, c-format
 msgid "Restore partition table"
-msgstr ""
+msgstr "Återställ partitionstabellen"
 
 #: ../help.pm:526
 #, c-format
 msgid "Rescue partition table"
-msgstr ""
+msgstr "Rädda partitionstabellen"
 
 #: ../help.pm:526
 #, c-format
@@ -1210,12 +1215,12 @@ msgstr "Automatisk montering av flyttningsbar media"
 #: ../help.pm:526
 #, c-format
 msgid "Wizard"
-msgstr ""
+msgstr "Guide"
 
 #: ../help.pm:526
 #, c-format
 msgid "Undo"
-msgstr ""
+msgstr "Ã…ngra"
 
 #: ../help.pm:526
 #, c-format
@@ -1223,36 +1228,42 @@ msgid "Toggle between normal/expert mode"
 msgstr "Byt mellan normal/expert läge"
 
 #: ../help.pm:536
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Fler än en Microsoft Windows-partition har hittats på hårddisken.\n"
@@ -1300,7 +1311,7 @@ msgstr ""
 "den fullständiga listan på länder."
 
 #: ../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"
@@ -1311,8 +1322,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1386,7 +1398,7 @@ msgstr ""
 "den icke-latinska."
 
 #: ../help.pm:612
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1480,7 +1492,7 @@ msgstr "Spanska"
 #: ../help.pm:643
 #, c-format
 msgid "Use Unicode by default"
-msgstr ""
+msgstr "Använd Unicode som standard"
 
 #: ../help.pm:646
 #, c-format
@@ -1582,7 +1594,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1608,7 +1620,7 @@ msgstr ""
 "vet vad det innebär."
 
 #: ../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"
@@ -1636,7 +1648,7 @@ msgid ""
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Här väljer du vilket skrivarsystem du ska använda. Andra operativsystem\n"
-"erbjuder dig kanske bara ett, men Mandriva erbjuder dig två.\n"
+"erbjuder dig kanske bara ett, men Mageia erbjuder dig två.\n"
 "Vilket skrivarsystem som är lämpligast är beroende på vilken \n"
 "systemkonfiguration du har.\n"
 "\n"
@@ -1660,7 +1672,7 @@ msgstr ""
 "\n"
 "Om du gör ett val nu och senare kommer fram till att du inte gillar\n"
 "skrivarsystemet kan du alltid ändra dig efter installationen genom att\n"
-"använda PrinterdDrake i Mandrivas kontrollcentral, och där klicka på\n"
+"använda PrinterdDrake i Mageias kontrollcentral, och där klicka på\n"
 "knappen \"%s\"."
 
 #: ../help.pm:768
@@ -1671,7 +1683,7 @@ msgstr "pdq"
 #: ../help.pm:724
 #, c-format
 msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
 
 #: ../help.pm:724
 #, c-format
@@ -1686,7 +1698,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1724,7 +1736,7 @@ msgstr ""
 "i din dator så kan du klicka på knappen för att välja en annan drivrutin."
 
 #: ../help.pm:794
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "As a review, DrakX will present a summary of information it has gathered\n"
 "about your system. Depending on the hardware installed on your machine, you\n"
@@ -1792,7 +1804,7 @@ msgstr ""
 "installerad så kan du ha några eller alla av de följande kategorierna.\n"
 "Varje kategori består av vad som konfigurerats, följt av en enkel\n"
 "sammanfattning av aktuell konfigurering.\n"
-"Klicka på motsvarande \"%s\"-knapp för att ändra konfigureringen.\n"
+"Klicka på motsvarande \"%s\"-knapp för att ändra konfigurationen.\n"
 "\n"
 " * \"%s\": kontrollera aktuella tangentbordsinställning och ändra om\n"
 "så önskas.\n"
@@ -1809,11 +1821,6 @@ msgstr ""
 " * \"%s\": kontrollera aktuell muskonfiguration och klicka på knappen för\n"
 "att ändra den om så önskas.\n"
 "\n"
-" * \"%s\": Genom att klicka på knappen \"%s\" så öppnas guiden för\n"
-"konfigurering av skrivare. Läs i motsvarande kapitel i \"Starter Guide\"\n"
-"för mer information om hur man konfigurerar en ny skrivare. Gränssnittet\n"
-"som används liknar det som användes under själva installationen.\n"
-"\n"
 " * \"%s\": om ett ljudkort hittats på ditt system så visas det här. Om du\n"
 "upptäcker att ljudkortet som visas inte stämmer överens med det som\n"
 "i själva verket finns på din dator så kan du klicka på knappen och\n"
@@ -1856,9 +1863,9 @@ msgstr ""
 "se över dessa inställningar."
 
 #: ../help.pm:809
-#, fuzzy, c-format
+#, c-format
 msgid "TV card"
-msgstr "ISDN-kort"
+msgstr "TV-kort"
 
 #: ../help.pm:809
 #, c-format
@@ -1871,9 +1878,9 @@ msgid "Graphical Interface"
 msgstr "Grafiskt gränssnitt"
 
 #: ../help.pm:861
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1886,12 +1893,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Klicka på \"%s\" om du vill ta bort alla data och alla partitioner som\n"
 "finns på denna hårddisk. Var försiktig, efter det att du klickat på \"%s\" \n"
diff --git a/perl-install/install/help/po/ta.po b/perl-install/install/help/po/ta.po
index c7b146f16..7c2e7cfad 100644
--- a/perl-install/install/help/po/ta.po
+++ b/perl-install/install/help/po/ta.po
@@ -120,7 +120,7 @@ msgstr "நீங�கள� இந�த வசதியை பயன�பட
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -130,28 +130,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "உதவி இன�னம�ம� மொழிபெயர�கப�படவில�லை.Listed above are the existing Linux partitions "
-"detected on your hard drive.\n"
+"detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, they are good for most common\n"
 "installations. If you make any changes, you must at least define a root\n"
 "partition (\"/\"). Do not choose too small a partition or you will not be\n"
@@ -161,24 +161,24 @@ msgstr ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 
 #: ../help.pm:88
@@ -598,31 +598,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -638,14 +638,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -880,19 +880,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -908,21 +908,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -939,33 +939,27 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "உதவி இன�னம�ம� மொழிபெயர�கப�படவில�லை.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"
 "defined, either from a previous installation of GNU/Linux or from another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
 " * \"Clear all\": this option deletes all partitions on the selected hard\n"
 "drive;\n"
 "\n"
 " * \"Auto allocate\": this option enables to automatically create \"Ext2\"\n"
-"and swap partitions in free space of your hard drive;\n"
+"and swap partitions in free space of your hard disk drive;\n"
 "\n"
 " * \"More\": gives access to additional features:\n"
 "\n"
@@ -988,7 +982,7 @@ msgstr ""
 "CD-ROMs.\n"
 "\n"
 " * \"Wizard\": use this option if you wish to use a wizard to partition\n"
-"your hard drive. This is recommended if you do not have a good knowledge of\n"
+"your hard disk drive. This is recommended if you do not have a good knowledge of\n"
 "partitioning;\n"
 "\n"
 " * \"Undo\": use this option to cancel your changes;\n"
@@ -996,7 +990,7 @@ msgstr ""
 " * \"Toggle to normal/expert mode\": allows additional actions on\n"
 "partitions (type, options, format) and gives more information;\n"
 "\n"
-" * \"Done\": when you are finished partitioning your hard drive, this will\n"
+" * \"Done\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "Note: you can reach any option using the keyboard. Navigate through the\n"
@@ -1012,12 +1006,6 @@ msgstr ""
 "\n"
 "To get information about the different filesystem types available, please\n"
 "read the ext2fs chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB, which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 
 #: ../help.pm:526
 #, c-format
@@ -1057,65 +1045,65 @@ msgstr "சாதாரனர� ம�றைமைக�க� மாற�"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "உதவி இன�னம�ம� மொழிபெயர�கப�படவில�ைல.More than one Microsoft partition has been "
-"detected on your hard drive.\n"
+"detected on your hard disk drive.\n"
 "Please choose the one you want to resize in order to install your new\n"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 
 #: ../help.pm:567
@@ -1139,8 +1127,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1333,7 +1321,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1392,7 +1380,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1522,7 +1510,7 @@ msgstr "வரைவியல�வழி"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1536,21 +1524,21 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "உதவி இன�னம�ம� மொழிபெயர�கப�படவில�லை. Click on \"OK\" if you want to delete all "
 "data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
+"partitions present on this hard disk drive."
 
 #: ../help.pm:872
 #, c-format
diff --git a/perl-install/install/help/po/tg.po b/perl-install/install/help/po/tg.po
index f21e7d367..99d5fb9e3 100644
--- a/perl-install/install/help/po/tg.po
+++ b/perl-install/install/help/po/tg.po
@@ -143,7 +143,7 @@ msgstr "Шумо ин хиÑ�латро иÑ�тифрда бурдан мехоҳÐ
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -153,24 +153,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Дар ин ҷо бахшҳои мавҷудаи Linux, ки дар гардонандаи �ахти шумо\n"
@@ -740,31 +740,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -780,14 +780,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1099,19 +1099,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1127,21 +1127,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1158,14 +1158,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Дар ин пункт шумо бо�д интихоб намоед, ки кадом бахш(ҳо) барои\n"
 "коргузории �и�темавӣ Mageia-и шумо и�тифода бурда мешаванд.\n"
@@ -1186,7 +1180,7 @@ msgstr ""
 "ме�озад\n"
 "\n"
 " * \"%s\": ин хо�и�т имкони�ти ба таври худкор офаридани бахшҳои\n"
-"ext3 ва swap-ро дар фазои холии гардонандаи �ахти шумо, медиҳад\n"
+"ext4 ва swap-ро дар фазои холии гардонандаи �ахти шумо, медиҳад\n"
 "\n"
 "\"%s\": ху�у�и�тҳои иловагиро да�тра� мекунад:\n"
 "\n"
@@ -1238,14 +1232,6 @@ msgstr ""
 "\n"
 "Барои гирифтани маълумот оиди намудҳои �и�темаи файлии да�тра�\n"
 "марҳамат карда боби ext2FS-ро аз ``Раҳнамои Муроҷиат'' хонед.\n"
-"\n"
-"�гар шумо дар мошинаи PPC коргузориро иҷро карда бошед, ба шумо\n"
-"лозим мео�д, ки бахши хурди HFS ``bootstrap''-ро офаред, ки ақалан 1Мб\n"
-"бошад ва он аз тарафи боркунандаи yaboot и�тифода бурда мешавад.\n"
-"�гар шумо хоҳед, ки бахшро каме калонтар кунед, ма�алан 50Мб шумо\n"
-"онро ҷои хеле қуллай барои захиракунии ҳа�таи �ҳтиётӣ ва �имоҳои ramdisk "
-"ҳангоми ҳоди�аи боркунии ғайричашмдошт,\n"
-"пайдо хоҳед кард."
 
 #: ../help.pm:526
 #, c-format
@@ -1285,34 +1271,34 @@ msgstr "Зомин байни у�ули мӯътадил/мутаха��и�ӣ
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Дар гардонандаи �ахти шумо зиёда аз �к бахши Microsoft муай�н гардид.\n"
@@ -1373,8 +1359,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1624,7 +1610,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1726,7 +1712,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1917,7 +1903,7 @@ msgstr "Интерфей�и Графикӣ"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1929,12 +1915,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Ба \"%s\" ангушт занед, агар шумо ҳамаи додаҳо ва қи�мҳое ки дар ин ди�ки "
 "�ахт\n"
diff --git a/perl-install/install/help/po/th.po b/perl-install/install/help/po/th.po
index 545ff237b..fc65aa12e 100644
--- a/perl-install/install/help/po/th.po
+++ b/perl-install/install/help/po/th.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2001-09-10 14:24GMT+7\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,8 @@ msgstr "คุณต้อง�ารใช้ aboot หรือไม่"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -94,24 +96,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -408,31 +414,35 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -448,14 +458,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -612,19 +623,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -640,21 +654,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -671,14 +687,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -719,34 +729,40 @@ msgstr "สำหรับผู้ชำนา� > ป�ติ"
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -771,8 +787,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -927,7 +944,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -986,7 +1003,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1109,7 +1126,7 @@ msgstr "ให้เป็น�ราฟฟิคเมื่อเริ่ม
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1121,12 +1138,14 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "�ด \"OK\" ถ้าคุณต้อง�ารลบข้อมูลทั้งหมดบน harddisk นี้\n"
 "นี่รวมถึง partitions ทั้งหมดซึ่งรวมถึง Windows ด้วย\n"
diff --git a/perl-install/install/help/po/tl.po b/perl-install/install/help/po/tl.po
index a473d3cfd..8881368a2 100644
--- a/perl-install/install/help/po/tl.po
+++ b/perl-install/install/help/po/tl.po
@@ -141,7 +141,7 @@ msgstr "Gusto ninyong gamitin ang katangian na ito?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -151,28 +151,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Nakalista rito ang mga namamalaging partisyon ng Linux na natiktikan sa\n"
-"inyong hard drive. Maaari ninyong itago ang mga pili ng Wizard, dahil sila\n"
+"inyong hard disk drive. Maaari ninyong itago ang mga pili ng Wizard, dahil sila\n"
 "ay mabuti para sa karamihan ng mga karaniwang \"installation\". Kung kayo\n"
 "ay gagawa ng mga pagbabago, mag-define dapat kayo ng partisyon ng\n"
 "\"root\" (\"/\"). Huwag pumili ng napakaliit na partisyon dahil hindi kayo "
@@ -186,31 +186,31 @@ msgstr ""
 "\n"
 "Bawat partisyon ay nakalista na sumusunod: \"Pangalan\", \"Capacity\".\n"
 "\n"
-"\"Pangalan\" ay naka-structure na: \"uri ng hard drive\", \"bilang ng hard "
+"\"Pangalan\" ay naka-structure na: \"uri ng hard disk drive\", \"bilang ng hard "
 "drive\",\n"
 "\"bilang ng partisyon\" (halimbawa, \"hda1\").\n"
 "\n"
-"\"Uri ng hard drive\" ay \"hd\" kung ang inyong hard drive ay isang IDE na "
-"hard drive\n"
-"at \"sd\" kung ito ay isang SCSI na hard drive.\n"
+"\"Uri ng hard disk drive\" ay \"hd\" kung ang inyong hard disk drive ay isang IDE na "
+"hard disk drive\n"
+"at \"sd\" kung ito ay isang SCSI na hard disk drive.\n"
 "\n"
-"\"Bilang ng hard drive\" ay palaging titik pagkatapos ng \"hd\" o \"sd\". "
+"\"Bilang ng hard disk drive\" ay palaging titik pagkatapos ng \"hd\" o \"sd\". "
 "Para\n"
-"sa mga IDE na hard drive:\n"
+"sa mga IDE na hard disk drive:\n"
 "\n"
-" * \"a\" ay nangangahulugang \"master hard drive sa primary IDE controller"
+" * \"a\" ay nangangahulugang \"master hard disk drive sa primary IDE controller"
 "\";\n"
 "\n"
-" * \"b\" ay nangangahulugang \"slave hard drive sa primary IDE controller"
+" * \"b\" ay nangangahulugang \"slave hard disk drive sa primary IDE controller"
 "\";\n"
 "\n"
-" * \"c\" ay nangangahulugang \"master hard drive sa secondary IDE controller"
+" * \"c\" ay nangangahulugang \"master hard disk drive sa secondary IDE controller"
 "\";\n"
 "\n"
-" * \"d\" ay nangangahulugang \"slave hard drive sa secondary IDE controller"
+" * \"d\" ay nangangahulugang \"slave hard disk drive sa secondary IDE controller"
 "\".\n"
 "\n"
-"Sa mga SCSI na hard drive, ang \"a\" ay nangangahulugang \"pinakamababang "
+"Sa mga SCSI na hard disk drive, ang \"a\" ay nangangahulugang \"pinakamababang "
 "SCSI ID\",\n"
 "ang \"b\" ay nangangahulugang \"pangalawang pinakamababang SCSI ID\", atbp."
 
@@ -746,31 +746,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -786,14 +786,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -807,16 +807,16 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 "Sa puntong ito, kailangan ninyong magpasya kung saan ninyo nais i-install\n"
-"ang Mageia na \"operating system\" (OS) sa inyong \"hard drive\".\n"
-"Kung ang inyong \"hard drive\" ay walang laman o kung may namamalaging\n"
+"ang Mageia na \"operating system\" (OS) sa inyong \"hard disk drive\".\n"
+"Kung ang inyong \"hard disk drive\" ay walang laman o kung may namamalaging\n"
 "\"operating system\" na gumagamit sa lahat ng available na puwang,\n"
 "kakailanganin ninyong ipartisyon ang drive. Ang pagpapartisyon ng isang\n"
-"\"hard drive\" ay ginagawa sa pamamagitan ng paghahati-hati nito sa\n"
+"\"hard disk drive\" ay ginagawa sa pamamagitan ng paghahati-hati nito sa\n"
 "kaisipan (\"logical\") upang makagawa ng puwang na kinakailangan para\n"
 "ma-install ang inyong bagong sistema ng Mageia.\n"
 "\n"
 "Dahil kadalasan na hindi na mababawi ang paraan ng pagpapartisyon ng\n"
-"hard drive at maaaring magdulot ng pagkawala ng data  kung mayroon\n"
+"hard disk drive at maaaring magdulot ng pagkawala ng data  kung mayroon\n"
 "nang \"operating system\" na naka-install sa drive, ang pagpapartisyon ay\n"
 "ay maaaring maging nakakatakot at nakaka-stress kung kayo ay baguhang\n"
 "user.Sa kagandahang palad, ang DrakX ay may kalakip na \"wizard\" na\n"
@@ -824,14 +824,14 @@ msgstr ""
 "basahin muna ang mga nalalabing bahagi ng section na ito at higit sa\n"
 "lahat, huwag magmadali.\n"
 "\n"
-"Depende sa confiugration ng inyong hard drive, mayroong ilang mga option:\n"
+"Depende sa confiugration ng inyong hard disk drive, mayroong ilang mga option:\n"
 "\n"
 " * \"%s\": ang option na ito ay magsasagawa ng automatic na pagpapartisyon\n"
-"ng inyong walang lamang hard drive. Kung gagamitin ninyon ang option na ito\n"
+"ng inyong walang lamang hard disk drive. Kung gagamitin ninyon ang option na ito\n"
 "hindi na magkakaroon ng iba pang mga \"prompt\".\n"
 "\n"
 " * \"%s\": natiktikan ng wizard na mayroong isa o mahigit na namamalaging\n"
-"partisyon ng Linux sa inyong \"hard drive\". Kung gusto ninyong gamitin "
+"partisyon ng Linux sa inyong \"hard disk drive\". Kung gusto ninyong gamitin "
 "sila,\n"
 "piliin ang option na ito. Pagkatapos kayo ay papipiliin ng mga \"mount point"
 "\"\n"
@@ -839,7 +839,7 @@ msgstr ""
 "na bilang default, at para sa karamihang bahagi isang magandang pagkukuro\n"
 "kung gagamitin sila.\n"
 "\n"
-" * \"%s\":  kung ang Microsoft Windows ay naka-install sa inyong hard drive "
+" * \"%s\":  kung ang Microsoft Windows ay naka-install sa inyong hard disk drive "
 "at\n"
 "ginagamit nito lahat ng mayroong puwang dito, kakailanganin ninyong\n"
 "gumawa ng libreng puwang para sa GNU/Linux. Para gawin ito, maaari ninyong\n"
@@ -858,7 +858,7 @@ msgstr ""
 "inyong data o mag-install ng bagong software.\n"
 "\n"
 " * \"%s\": kung gusto ninyong tanggalin lahat ng data at mga partisyon\n"
-"na mayroon sa inyong hard drive at palitan sila ng inyong bagong sistema\n"
+"na mayroon sa inyong hard disk drive at palitan sila ng inyong bagong sistema\n"
 "ng Mageia, piliin ang option na ito. Maging maingat, dahil hindi na\n"
 "ninyo maaaring bawiin ang inyong pili matapos ninyong patotohanan ito.\n"
 "\n"
@@ -876,7 +876,7 @@ msgstr ""
 "\n"
 " * \"%s\": piliin ang option na ito kung nais ninyong mano-manong "
 "ipartisyon\n"
-"ang inyong hard drive. Maging maingat -- ito ay makapangyarihan ngunit\n"
+"ang inyong hard disk drive. Maging maingat -- ito ay makapangyarihan ngunit\n"
 "mapanganib na pili at maaaring madali ninyong mawala ang lahat ng\n"
 "inyong data. Ito ang dahilan kung bakit ipinapayo lamang ang option na ito\n"
 "kung kayo ay nakagawa na dati ng ganito at mayroong karanasan. Para sa\n"
@@ -1016,7 +1016,7 @@ msgid ""
 "bad blocks on the disk."
 msgstr ""
 "Kailangang i-format ang kahit anong partisyon na bagong gawa para ito\n"
-"magamit (ang ibig sabihin ng pagfo-format ay paglilikha ng \"file system"
+"magamit (ang ibig sabihin ng pagfo-format ay paglilikha ng \"filesystem"
 "\").\n"
 "\n"
 "Sa ngayon, maaari ninyong naisin na i-format muli ang ilang mga mayroon\n"
@@ -1112,19 +1112,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1140,21 +1140,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1171,36 +1171,30 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Sa puntong ito, kailangan ninyong piliin kung aling mga partisyon ang\n"
 "gagamitin para sa pag-i-install ng sistema na Mageia. Kung ang\n"
 "mga partisyon ay nai-define na, mula sa dating pag-i-install ng GNU/Linux\n"
 "o ng ibang kasangkapang pangpartisyon, maaari ninyong gamiting ang\n"
 "mga mayroon nang partisyon. Kung hindi, dapat mag-define ng mga\n"
-"partisyon ng hard drive.\n"
+"partisyon ng hard disk drive.\n"
 "\n"
-"Upang makalikha ng mga partisyon, dapat pumili muna kayo ng hard drive.\n"
+"Upang makalikha ng mga partisyon, dapat pumili muna kayo ng hard disk drive.\n"
 "Maaari ninyong piliin ang disk para sa pagpapartisyon sa pamamagitan ng\n"
 "pagki-click sa ``hda'' para sa unang IDE na drive, ``hdb'' para sa "
 "pangalawa,\n"
 "``sda'' para sa unang SCSI na drive at ganon.\n"
 "\n"
-"Para ipartisyon ang napiling hard drive, maaari ninyong gamitin ang mga\n"
+"Para ipartisyon ang napiling hard disk drive, maaari ninyong gamitin ang mga\n"
 "option na ito:\n"
 "\n"
 " * \"%s\": ang option na ito ay magtatanggal ng lahat ng partisyon sa\n"
-"napiling hard drive\n"
+"napiling hard disk drive\n"
 "\n"
 " * \"%s\": ang option na ito ay hahayaan kayo na automatic na lumikha\n"
-"ng ext3 at swap na partisyon sa libreng puwang ng inyong hard drive\n"
+"ng ext4 at swap na partisyon sa libreng puwang ng inyong hard disk drive\n"
 "\n"
 "\"%s\": magbibigay daan sa karagdang mga katangian (\"feature\"):\n"
 "\n"
@@ -1216,7 +1210,7 @@ msgstr ""
 "na hindi iyon parating gumagana.\n"
 "\n"
 " * \"%s\": babalewalain lahat ng mga pagbabago at kukunin muli ang\n"
-"partition table na nasa hard drive noong una pa.\n"
+"partition table na nasa hard disk drive noong una pa.\n"
 "\n"
 " * \"%s\": ang pagtatanggal ng check sa option na ito ay magpipilit sa mga\n"
 "gumagamit na mano-manong i-mount at i-unmount ang \"removable media\"\n"
@@ -1224,16 +1218,16 @@ msgstr ""
 "\n"
 " * \"%s\": gamitin ang option na ito kung nais ninyong gumamit ng wizard "
 "para\n"
-"i-partisyon ang inyong hard drive. Ito ay nirerekomenda kung kayo ay walang\n"
+"i-partisyon ang inyong hard disk drive. Ito ay nirerekomenda kung kayo ay walang\n"
 "mabuting kaalaman sa pagpapartisyon.\n"
 "\n"
 " * \"%s\": gamitin ang option na ito para bawiin ang mga pagbabago.\n"
 "\n"
 " * \"%s\": magpapahintulot ng karagdagang magagawa sa mga partisyon (uri,\n"
 ", mga option, format) at magbibigay ng mas maraming inpormasyon tungkol\n"
-"sa hard drive.\n"
+"sa hard disk drive.\n"
 "\n"
-" * \"%s\": kung kayo ay tapos na sa pagpapartisyon  ng inyong hard drive, "
+" * \"%s\": kung kayo ay tapos na sa pagpapartisyon  ng inyong hard disk drive, "
 "ito\n"
 "ay magse-save ng inyong mga pagbabago pabalik sa disk.\n"
 "\n"
@@ -1253,17 +1247,9 @@ msgstr ""
 "\n"
 " * Ctrl-m para i-set kung saan ilalagay (\"mount point\")\n"
 "\n"
-"Para makakuha ng inpormasyon tungkol sa mga iba't-ibang uri ng \"file system"
+"Para makakuha ng inpormasyon tungkol sa mga iba't-ibang uri ng \"filesystem"
 "\",\n"
 "pakibasa ang kabanata ng ext2FS mula sa ``Reference Manual''.\n"
-"\n"
-"Kung kayo ay nag-i-install sa makina ng PPC, gugustuhin ninyong lumikha ng\n"
-"maliit na partisyon na HFS ``bootstrap'' na may laking hindi liliit sa 1MB "
-"na\n"
-"gagamitin ng yaboot bootloader. Kung pipiliin ninyong mas malaki ang\n"
-"partisyon, mga 50MB, makikita ninyong ito ay kapakipakinabang na lugar\n"
-"sa pag-iimbak ng mga reserbang kernel at mga \"ramdisk image\" para sa\n"
-"panahon ng mahigpit na pangangailangan."
 
 #: ../help.pm:526
 #, c-format
@@ -1303,34 +1289,34 @@ msgstr "Lipat sa normal o bihasang mode"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Mahigit sa isang partisyon ng Microsoft ang natiktikan sa inyong hard "
@@ -1341,33 +1327,33 @@ msgstr ""
 "Bawat partition ay nakalista ng ganito: \"Pangalan ng Linux\",\n"
 "\"Pangalan ng Windows\", \"Capacity\".\n"
 "\n"
-"\"Pangalan ng Linux name\" ay may istruktura na: \"uri ng hard drive\",\n"
-"\"bilang ng hard drive\",\"bilang ng partisyon\" (halimbawa, \"hda1\").\n"
+"\"Pangalan ng Linux name\" ay may istruktura na: \"uri ng hard disk drive\",\n"
+"\"bilang ng hard disk drive\",\"bilang ng partisyon\" (halimbawa, \"hda1\").\n"
 "\n"
-"\"Uri ng hard drive\" ay \"hd\" kung ang inyong hard dive ay isang IDE\n"
-"na hard drive at \"sd\" kung iyon ay isang SCSI na hard drive.\n"
+"\"Uri ng hard disk drive\" ay \"hd\" kung ang inyong hard dive ay isang IDE\n"
+"na hard disk drive at \"sd\" kung iyon ay isang SCSI na hard disk drive.\n"
 "\n"
-"\"Bilang ng hard drive\" ay palaging titik pagkatapos ng \"hd\" o \"sd\". "
+"\"Bilang ng hard disk drive\" ay palaging titik pagkatapos ng \"hd\" o \"sd\". "
 "Para\n"
-"sa mga IDE na hard drive:\n"
+"sa mga IDE na hard disk drive:\n"
 "\n"
-" * \"a\" ay nangangahulugang \"master hard drive sa primary IDE controller"
+" * \"a\" ay nangangahulugang \"master hard disk drive sa primary IDE controller"
 "\";\n"
 "\n"
-" * \"b\" ay nangangahulugang \"slave hard drive sa primary IDE controller"
+" * \"b\" ay nangangahulugang \"slave hard disk drive sa primary IDE controller"
 "\";\n"
 "\n"
-" * \"c\" ay nangangahulugang \"master hard drive sa secondary IDE controller"
+" * \"c\" ay nangangahulugang \"master hard disk drive sa secondary IDE controller"
 "\";\n"
 "\n"
-" * \"d\" ay nangangahulugang \"slave hard drive sa secondary IDE controller"
+" * \"d\" ay nangangahulugang \"slave hard disk drive sa secondary IDE controller"
 "\".\n"
 "\n"
-"Sa mga SCSI na hard drive, ang \"a\" ay nangangahulugang \"pinakamababang "
+"Sa mga SCSI na hard disk drive, ang \"a\" ay nangangahulugang \"pinakamababang "
 "SCSI ID\",\n"
 "ang \"b\" ay nangangahulugang \"pangalawang pinakamababang SCSI ID\", atbp.\n"
 "\n"
-"\"Pangalan ng Windows\" ay ang titik ng inyong hard drive sa ilalim ng "
+"\"Pangalan ng Windows\" ay ang titik ng inyong hard disk drive sa ilalim ng "
 "Windows\n"
 "(ang unang disk o partisyon ay tinatawag na \"C:\")."
 
@@ -1396,8 +1382,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1416,7 +1402,7 @@ msgstr ""
 "\n"
 " * \"%s\": Para sa karamihang bahagi, ganap na binubura nito ang lumang\n"
 "sistema. Kung nais ninyong baguhin kung paano ang pagpartisyon sa inyong\n"
-"hard drive, o baguhin ang file system, dapat ninyong gamitin ang option na\n"
+"hard disk drive, o baguhin ang filesystem, dapat ninyong gamitin ang option na\n"
 "ito. Subalit, depende sa inyong pakana ng pagpapartisyon, maaari ninyong\n"
 "pigilang masulatan ang ilan sa inyong mga namamalaging data.\n"
 "\n"
@@ -1685,7 +1671,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1793,7 +1779,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1811,7 +1797,7 @@ msgstr ""
 "naaangkop na driver.\n"
 "\n"
 "Dahil sa hindi perpekto ang pagtiktik sa hardware, ang DrakX ay maaaring\n"
-"mabigo sa pagtitiktik sa inyong mga hard drive. Kung gayon, dapat ninyong\n"
+"mabigo sa pagtitiktik sa inyong mga hard disk drive. Kung gayon, dapat ninyong\n"
 "sabihin ang inyong hardware ng mano-mano.\n"
 "\n"
 "Kung kinailangan na mano-mano ninyong sabihin ang inyong PCI SCSI adapter,\n"
@@ -1996,11 +1982,11 @@ msgstr "Graphical Interface"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
-"Piliin ang hard drive na inyong gustong burahin upang ma-install ang\n"
+"Piliin ang hard disk drive na inyong gustong burahin upang ma-install ang\n"
 "inyong bagong Mageia na partisyon. Mag-ingat, lahat ng data\n"
 "sa drive na ito ay mawawala at hindi na ito mababawi!"
 
@@ -2008,21 +1994,21 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "I-click ang \"%s\" kung gusto ninyong tangalin lahat ng data at partisyon\n"
-"na mayroon sa hard drive na ito. Mag-ingat, pagkatapos ma-click ang\n"
+"na mayroon sa hard disk drive na ito. Mag-ingat, pagkatapos ma-click ang\n"
 "\"%s\", hindi na ninyo mababawi ang kahit anong data at mga partisyon\n"
-"na mayroon sa hard drive na ito, kasama ang kahit anong data ng Windows.\n"
+"na mayroon sa hard disk drive na ito, kasama ang kahit anong data ng Windows.\n"
 "\n"
 "I-click ang \"%s\" para hindi ituloy ang operasyon na ito na walang "
 "mawawlang\n"
-"data at mga partisyon na mayroon sa hard drive na ito."
+"data at mga partisyon na mayroon sa hard disk drive na ito."
 
 #: ../help.pm:872
 #, c-format
diff --git a/perl-install/install/help/po/tr.po b/perl-install/install/help/po/tr.po
index 8cda7626d..2c48ade09 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
@@ -130,7 +142,7 @@ msgstr "Bu özelliği kullanmak istiyor musunuz?"
 #: ../help.pm:57
 #, fuzzy, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -140,24 +152,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Yukarıdakiler, sabit diskinizde bulunan Linux bölümleridir. Genel kullanım\n"
@@ -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,42 +629,43 @@ 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 drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -652,14 +681,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\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"
@@ -972,19 +1001,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1000,21 +1029,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1031,14 +1060,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Bu noktada, Mageia iÅŸletim sisteminizi sabit diskinizde nereye\n"
 "kuracağınızı seçmeniz gerekiyor. Bölümler önceki bir kurulumda ya da bir\n"
@@ -1111,14 +1134,6 @@ msgstr ""
 "Başka dosya sistemleri hakkında bilgi edinmek için \"Başvuru Kılavuzu"
 "\"ndaki\n"
 "ext2fs bölümünü okuyunuz.\n"
-"\n"
-"Bir PPC makina üzerine kurulum yapıyorsanız, yaboot önyükleyicisi "
-"tarafından\n"
-"kullanılmak üzere en az 1MB lık küçük bir HFS \"önyükleme\" bölümü "
-"oluÅŸturmak\n"
-"isteyeceksiniz. Bu disk bölümünü biraz daha büyük, örneğin 50MB yaparsanız\n"
-"bir yedek çekirdeğin ve kurtarma açılışı gereksinimleri için ramdisk\n"
-"görüntüsünün saklanacağı kullanışlı bir alan elde edebilirsiniz."
 
 #: ../help.pm:526
 #, c-format
@@ -1158,34 +1173,34 @@ msgstr "Normal/Uzman kipleri arasında geçiş yap"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Sabit diskinizde birden fazla Windows bölümü bulundu. Yeni Mageia\n"
@@ -1245,8 +1260,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1459,7 +1474,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1567,7 +1582,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1661,9 +1676,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,9 +1691,9 @@ msgid "Graphical Interface"
 msgstr "Grafiksel Arabirim"
 
 #: ../help.pm:861
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1687,15 +1702,15 @@ 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 drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Bu sabit disk üzerindeki tüm verinin ve bölümlerin silinmesini istiyorsanız\n"
 "\"%s\" tuşuna tıklayın. Dikkatli olun, \"%s\"  tuşuna tıkladıktan\n"
diff --git a/perl-install/install/help/po/uk.po b/perl-install/install/help/po/uk.po
index e74eb07b7..5a472691e 100644
--- a/perl-install/install/help/po/uk.po
+++ b/perl-install/install/help/po/uk.po
@@ -1,39 +1,40 @@
 # translation of DrakX-uk.po to ukrainian
 # translation of DrakX.po to ukrainian
-# $Id: uk.po 26602 2006-04-22 07:43:48Z fwang $
 # Copyright (C) 2000,2003, 2004, 2005 Free Software Foundation, Inc.
+#
 # Dmytro  Kovalov <kov@tokyo.email.ne.jp>, 2000.
 # Taras Boychuk <btr1@torba.com>, 2003, 2004.
 # Taras Boychuk <btr1@mail.ru>, 2004, 2003.
 # Taras Boychuk <btr1@ukrpost.net>, 2004, 2005.
-#
+# Yuri Chornoivan <yurchor@ukr.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-uk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-12 12:22+0200\n"
-"PO-Revision-Date: 2005-03-01 01:29+0200\n"
-"Last-Translator: Taras Boychuk <btr1@ukrpost.net>\n"
-"Language-Team: ukrainian <uk@li.org>\n"
+"PO-Revision-Date: 2012-06-29 16:20+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: uk\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"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
-"Перш, ніж продовжувати, прочитайте уважно умови ліцензії. Вона\n"
-"�то�уєть�� в�ього ди�трибутиву Мандріва лінак�. Якщо Ви\n"
-"погоджуєте�ь з умовами ліцензії, помітьте \"%s\". Якщо ні,\n"
-"то нати�ніть \"%s\", щоб перезавантажити комп'ютер."
+"Перш ніж продовжувати, прочитайте уважно умови ліцензії. Вона\n"
+"�то�уєть�� в�ього ди�трибутива Mageia. Якщо ви\n"
+"погоджуєте�ь з умовами ліцензії, позначте пункт «%s». Якщо ні,\n"
+"нати�ніть «%s», щоб перезавантажити комп'ютер."
 
 #: ../help.pm:20
 #, c-format
@@ -77,53 +78,53 @@ msgid ""
 msgstr ""
 "GNU/Linux - багатокори�тувацька �и�тема, це означає, що кожен з\n"
 "кори�тувачів може мати �вої вла�ні у�тановки, вла�ні файли, тощо. Щоб\n"
-"більше дізнати�� про це, Ви можете прочитати Підручник кори�тувача з\n"
+"більше дізнати�� про це, ви можете прочитати Підручник кори�тувача з\n"
 "�и�теми. �ле на відміну від кори�тувача Root, �кий є адміні�тратором\n"
-"�и�теми, кори�тувачі, �ких Ви будете �творювати на цьому кроці, не\n"
+"�и�теми, кори�тувачі, �ких ви будете �творювати на цьому кроці, не\n"
 "мають права змінювати нічого в �и�темі, крім �воїх вла�них файлів і\n"
-"вла�ної конфігурації. Ви маєте �творити рахунок дл� хоча б одного\n"
-"єдиного кори�тувача - дл� �амого �ебе. Ви будете кори�тувати�� цим\n"
+"вла�ної конфігурації. ви маєте �творити рахунок дл� хоча б одного\n"
+"єдиного кори�тувача - дл� �амого �ебе. ви будете кори�тувати�� цим\n"
 "рахунком дл� того, щоб виконувати щоденні задачі. І хоча це і дуже\n"
 "зручно реє�трувати�ь в �и�темі �к Root, але одноча�но це і дуже\n"
 "небезпечно! �айменша помилка може призве�ти до того, що �и�тема буде\n"
-"неробочою. Якщо Ви помилите�ь �к звичайний кори�тувач, Ви можете,\n"
+"неробочою. Якщо ви помилите�ь �к звичайний кори�тувач, ви можете,\n"
 "звичайно, втратити де�кі �вої дані, але не в�ю �и�тему.\n"
 "\n"
-"Перше поле запитує Ваше �правжнє ім'�. Звичайно ж, воно не обов'�зкове,\n"
-"Ви можете надрукувати в�е, що завгодно. DrakX візьме перше �лово з цього\n"
-"пол� і �копіює його в поле \"%s\", �ке є ім'�м кори�тувача, під �ким "
+"Перше поле запитує ваше �правжнє ім'�. Звичайно ж, воно не обов'�зкове,\n"
+"ви можете надрукувати в�е, що завгодно. DrakX візьме перше �лово з цього\n"
+"пол� і �копіює його в поле «%s», �ке є ім'�м кори�тувача, під �ким "
 "кори�тувач\n"
-"буде реє�трувати�ь у �и�темі. Якщо захочете, Ви можете змінити це ім'�. \n"
-"Потім Вам потрібно вве�ти пароль. З міркувань безпеки �и�теми пароль\n"
+"буде реє�трувати�ь у �и�темі. Якщо захочете, ви можете змінити це ім'�. \n"
+"Потім вам потрібно вве�ти пароль. З міркувань безпеки �и�теми пароль\n"
 "звичайного (не root) кори�тувача не є таким критичним, �к пароль \n"
 "адміні�тратора, але в�е одно немає причин дл� того, щоб нехтувати ним,\n"
 "залишаючи його порожнім або надто про�тим: врешті-решт, це загрожує\n"
 "Вашим вла�ним файлам. \n"
 "\n"
-"Пі�л� того, �к Ви нати�нете кнопку \"%s\", Ви можете додати ще багато \n"
+"Пі�л� того, �к ви нати�нете кнопку «%s», ви можете додати ще багато \n"
 "інших кори�тувачів. Додайте кори�тувача дл� кожного з Ваших друзів:\n"
-"дл� тата й �е�три, наприклад. Пі�л� того, �к Ви закінчили додавати\n"
-"кори�тувачів, нати�ніть \"%s\".\n"
+"дл� тата й �е�три, наприклад. Пі�л� того, �к ви закінчили додавати\n"
+"кори�тувачів, нати�ніть «%s».\n"
 "\n"
-"�ати�нувши на кнопку \"%s\", Ви зможете змінити типову командну оболонку\n"
+"�ати�нувши на кнопку «%s», ви зможете змінити типову командну оболонку\n"
 "дл� кожного кори�тувача (типова оболонка - bash). \n"
 "\n"
-"Коли Ви закінчите додавати кори�тувачів, Вам буде запропоновано вибрати\n"
-"кори�тувача, �кий буде автоматично реє�трувати�� в �и�темі при �тартуванні\n"
-"комп'ютера. Якщо така можливі�ть Ва� цікавить (і не надто турбує про\n"
+"Коли ви закінчите додавати кори�тувачів, вам буде запропоновано вибрати\n"
+"кори�тувача, �кий буде автоматично реє�трувати�� в �и�темі при запу�ку\n"
+"комп'ютера. Якщо така можливі�ть ва� цікавить (і не надто турбує про\n"
 "локальну безпеку), виберіть кори�тувача і менеджер вікон, тоді нати�ніть "
 "на \n"
-"\"%s\". Якщо Ва� така можливі�ть не цікавить, відмініть вибір \"%s\"."
+"«%s». Якщо ва� така можливі�ть не цікавить, �ка�уйте вибір «%s»."
 
 #: ../help.pm:54
 #, c-format
 msgid "User name"
-msgstr ""
+msgstr "Ім'� кори�тувача"
 
 #: ../help.pm:54
 #, c-format
 msgid "Accept user"
-msgstr ""
+msgstr "Прийн�ти кори�тувача"
 
 #: ../help.pm:54
 #, c-format
@@ -133,7 +134,8 @@ msgstr "Ви хочете викори�товувати цю можливі�т
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -143,45 +145,48 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Тут перелічені вже і�нуючі розділи, знайдені на Вашому твердому\n"
-"ди�ку. Ви можете залишити вибір, зроблений Помічником, він підходить\n"
-"дл� більшо�ті випадків в�тановленн�. Якщо Ви робите �кі�ь зміни, то "
+"ди�ку. ви можете залишити вибір, зроблений Помічником, він підходить\n"
+"дл� більшо�ті випадків в�тановленн�. Якщо ви робите �кі�ь зміни, то "
 "потрібно\n"
 "�к мінімум �творити кореневу файлову �и�тему (/). �е виділ�йте\n"
-"дл� цього занадто малий розділ, бо інакше Ви не зможете в�тановити\n"
-"в�і потрібні Вам програми. Якщо Ви бажаєте зберігати в�і �вої дані в\n"
+"дл� цього занадто малий розділ, бо інакше ви не зможете в�тановити\n"
+"в�і потрібні вам програми. Якщо ви бажаєте зберігати в�і �вої дані в\n"
 "окремому розділі, потрібно буде також �творити розділ \"/home\" (тільки у\n"
-"випадку, �кщо Ви маєте більше одного розділа дл� Лінак�а). \n"
+"випадку, �кщо ви маєте більше одного розділу дл� Linux). \n"
 "\n"
 "Кожен розділ показано в такому вигл�ді: \"�азва\", \"Розмір\".\n"
 "\n"
-"�азва розшифровуєть�� так: \"тип твердого ди�ку\", \"номер твердого\n"
+"�азва розшифровуєть�� так: \"тип жор�ткого ди�ка\", \"номер твердого\n"
 "ди�ку\", \"номер розділу на ди�ку\", (наприклад: \"hda1\").\n"
 "\n"
-"\"Тип твердого ди�ку\" - це \"hd\", �кщо Ви маєте ди�к типу IDE, і \"sd\",\n"
-"�кщо Ви маєте твердий ди�к типу SCSI.\n"
+"\"Тип жор�ткого ди�ка\" - це \"hd\", �кщо ви маєте ди�к типу IDE, і \"sd\",\n"
+"�кщо ви маєте твердий ди�к типу SCSI.\n"
 "\n"
-"\"�омер твердого ди�ку\" - це завжди літера пі�л� \"hd\" чи \"sd\". Дл�\n"
+"\"�омер жор�ткого ди�ка\" - це завжди літера пі�л� \"hd\" чи \"sd\". Дл�\n"
 "ди�ків типу IDE це:\n"
 "\n"
 "    * \"a\" - головний ди�к (master) на першому контролері IDE,\n"
@@ -192,12 +197,11 @@ msgstr ""
 "\n"
 "    * \"d\" - вторинний ди�к на другому контролері IDE.\n"
 "\n"
-"Дл� SCSI ди�ків \"a\" означає \"головний ди�к\", \"b\" - другор�дний ди�к, "
-"Ñ–\n"
-"т.д. ..."
+"Дл� SCSI ди�ків \"a\" означає \"головний ди�к\", \"b\" - другор�дний ди�к\n"
+"тощо."
 
 #: ../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"
@@ -205,14 +209,14 @@ msgid ""
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Ди�трибутив Мандріва лінак� розміщений на кількох компакт-ди�ках.\n"
+"Дані ди�трибутива Mageia розміщено на кількох компакт-ди�ках.\n"
 "Якщо вибраний пакунок знаходить�� на іншому ди�ку, DrakX викине \n"
 "поточний компакт-ди�к і попро�ить в�тавити потрібний. Якщо у ва� немає\n"
-"потрібного ди�ку під руками, про�то нати�ніть \"%s\", пакунок не буде\n"
+"потрібного ди�ку під руками, про�то нати�ніть «%s», пакунок не буде\n"
 "в�тановлено."
 
 #: ../help.pm:95
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
 "There are thousands of packages available for Mageia, and to make it\n"
@@ -269,59 +273,59 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"Тепер ча� вибрати, �кі програми Ви хочете в�тановити в �воїй\n"
-"�и�темі. Мандріва лінак� має ти��чі програмних пакунків, і щоб �про�тити\n"
+"Тепер ча� вибрати, �кі програми ви хочете в�тановити в �воїй\n"
+"�и�темі. Mageia має ти��чі програмних пакунків, і щоб �про�тити\n"
 "керуванн� ними, пакунки розміщено в групи подібних програм.\n"
 "\n"
 "Пакунки роз�ортовано в групи відповідно до �по�обу викори�танн� Вашої\n"
-"машини. Мандріва Лінак� має чотири попередньо налаштовані типи\n"
-"в�тановленн�. Ви можете комбінувати і підбирати програми з різних\n"
+"машини. Mageia має чотири попередньо налаштовані типи\n"
+"в�тановленн�. ви можете комбінувати і підбирати програми з різних\n"
 "груп, і в�тановленн� типу \"Робоча �танці�\"' може мати програми із групи\n"
 "пакунків \"Розробник\".\n"
 "\n"
-" * \"%s\": �кщо Ви збираєте�ь викори�товувати �вою машину �к робочу\n"
+" * «%s»: �кщо ви збираєте�ь викори�товувати �вою машину �к робочу\n"
 "�танцію, виберіть одну чи більше програм з цієї групи.\n"
 "\n"
-" * \"%s\": �кщо Ви збираєте�ь викори�товувати цю машину дл�\n"
+" * «%s»: �кщо ви збираєте�ь викори�товувати цю машину дл�\n"
 "програмуванн�, виберіть відповідні пакунки з цієї групи. Спеціальна група\n"
 "\"СБЛ\" налаштує �и�тему таким чином, що вона мі�титиме �кнайповнішу\n"
-"�пецифікацію Стандартної бази Лінак�а.\n"
+"�пецифікацію Стандартної бази Linux.\n"
 "\n"
 "   При виборі групи \"СБЛ\" в�тановить�� �дро �ерії \"2.4\", на відміну від\n"
 "\"2.6\", �ке в�тановлюєть�� типово. Ц� зроблено дл� 100%% впевнено�ті у\n"
-"�умі�но�ті з \"СБЛ\". Проте, �кщо Ви не виберете групу \"СБЛ\", в�еодно\n"
+"�умі�но�ті з \"СБЛ\". Проте, �кщо ви не виберете групу \"СБЛ\", в�еодно\n"
 "отримаєте �и�тему майже 100%%-�умі�ну з \"СБЛ\".\n"
 "\n"
-" * \"%s\": �кщо машина призначаєть�� дл� викори�танн� в �ко�ті\n"
-"�ервера, виберіть додаткові �ерві�и, �кі Ви хочете в�тановити на �воїй\n"
+" * «%s»: �кщо машина призначаєть�� дл� викори�танн� в �ко�ті\n"
+"�ервера, виберіть додаткові �ерві�и, �кі ви хочете в�тановити на �воїй\n"
 "машині.\n"
 "\n"
-" * \"%s\": тут Ви можете вибрати графічне �ередовище �обі до вподоби.\n"
-"Виберіть хоча б одне, �кщо Ви хочете мати графічний інтерфей�.\n"
+" * «%s»: тут ви можете вибрати графічне �ередовище �обі до вподоби.\n"
+"Виберіть хоча б одне, �кщо ви хочете мати графічний інтерфей�.\n"
 "\n"
 "При пере�уванні кур�ора над назвою групи буде ви�вічувати�� тек�т із\n"
 "коротким по��ненн�м про групу.\n"
 "\n"
-"Ви можете помітити \"%s\", що може викори�товувати�� при добрих\n"
-"знанн�х пакунків, або �кщо Ви хочете мати повний контроль над тим,\n"
+"ви можете помітити «%s», що може викори�товувати�� при добрих\n"
+"знанн�х пакунків, або �кщо ви хочете мати повний контроль над тим,\n"
 "що в�тановлюєте.\n"
 "\n"
-"Якщо Ви почали в�тановленн� в режимі \"%s\", можете зн�ти вибір у�іх\n"
+"Якщо ви почали в�тановленн� в режимі «%s», можете зн�ти вибір у�іх\n"
 "груп і не в�тановлювати жодних нових пакунків. Це можна\n"
 "викори�товувати при відновленні або поновленні �и�теми.\n"
 "\n"
-"Якщо Ви зн�ли вибір у�іх груп під ча� підготовки звичайного\n"
+"Якщо ви зн�ли вибір у�іх груп під ча� підготовки звичайного\n"
 "в�тановленн� (на відміну від поновленн�), по�вить�� діалогове\n"
 "вікно з різними параметрами дл� мінімального в�тановленн�:\n"
 "\n"
-" * \"%s\":в�тановити найменшу можливу кількі�ть пакунків, щоб мати\n"
+" * «%s»:в�тановити найменшу можливу кількі�ть пакунків, щоб мати\n"
 "працюючу графічну �тільницю.\n"
 "\n"
-" * \"%s\": в�тановлює о�новну �и�тему плю� о�новні ін�трументи і їх\n"
+" * «%s»: в�тановлює о�новну �и�тему плю� о�новні ін�трументи і їх\n"
 "документацію. Цей �по�іб викори�товуєть�� дл� в�тановленн� �ервера.\n"
 "\n"
-" * \"%s\": в�тановить аб�олютно найменшу кількі�ть пакунків, необхідних,\n"
-"щоб отримати працюючу �и�тему Лінак�. При цьому в�тановленні Ви\n"
+" * «%s»: в�тановить аб�олютно найменшу кількі�ть пакунків, необхідних,\n"
+"щоб отримати працюючу �и�тему Linux. При цьому в�тановленні Ви\n"
 "будете мати тільки інтерфей� командного р�дка. Загальний розмір цього\n"
 "в�тановленн� �тановить біл� 65 мегабайтів."
 
@@ -341,7 +345,7 @@ msgid "Truly minimal install"
 msgstr "�а�правді мінімальне в�тановленн�"
 
 #: ../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"
@@ -377,28 +381,28 @@ msgid ""
 "another installation. See the second tip of the last step on how to create\n"
 "such a floppy."
 msgstr ""
-"Якщо Ви вказали програмі в�тановленн�, що хочете мати індивідуальний\n"
-"вибір пакунків, Вам буде показано повне дерево пакунків, зібраних за\n"
-"групами і підгрупами. Перегл�даючи дерево, Ви зможете вибрати повні\n"
+"Якщо ви вказали програмі в�тановленн�, що хочете мати індивідуальний\n"
+"вибір пакунків, вам буде показано повне дерево пакунків, зібраних за\n"
+"групами і підгрупами. Перегл�даючи дерево, ви зможете вибрати повні\n"
 "групи, підгрупи та окремі пакунки.\n"
 "\n"
-"Кожного разу, коли Ви вибираєте пакунок в дереві, �права з'�вл�єть��\n"
+"Кожного разу, коли ви вибираєте пакунок в дереві, �права з'�вл�єть��\n"
 "підказка про призначенн� пакунка.\n"
 "\n"
 "!! Якщо було вибрано �ерверний пакунок, чи то шл�хом �пеціального\n"
 "вибору індивідуального пакунка, чи він є �кладовою ча�тиною групи\n"
-"пакунків, Вам буде задане запитанн�, чи Ви �правді бажаєте в�тановити\n"
-"ці �ервери. В Мандріва лінак� в�і в�тановлені �ервери автоматично\n"
+"пакунків, вам буде задане запитанн�, чи ви �правді бажаєте в�тановити\n"
+"ці �ервери. В Mageia в�і в�тановлені �ервери автоматично\n"
 "запу�кають�� при завантаженні �и�теми. �авіть, �кщо на ча� придбанн�\n"
 "�и�теми не було відомо жодних проблем з безпекою даних �ерверів,\n"
 "можливо, що пі�л� в�тановленн� �и�теми такі проблеми буде ви�влено.\n"
-"Якщо Ви не знаєте призначенн� конкретного �ервера або з �кою метою\n"
-"його в�тановлено, нати�ніть \"%s\". Якщо Ви нати�нете \"%s\", буде\n"
+"Якщо ви не знаєте призначенн� конкретного �ервера або з �кою метою\n"
+"його в�тановлено, нати�ніть «%s». Якщо ви нати�нете «%s», буде\n"
 "в�тановлено перелічені �ервери і вони будуть �тартувати автоматично під\n"
 "ча� завантаженн� !!\n"
 "\n"
-"Параметр \"%s\" викори�товуєть��, щоб заборонити діалог попередженн�,\n"
-"�кий по�вл�єть��, �к тільки програма в�тановленн� автоматично вибирає\n"
+"Параметр «%s» викори�товуєть��, щоб заборонити показ вікна попередженн�,\n"
+"�ке буде з’�вл�єть��, щойно програма в�тановленн� автоматично вибирає\n"
 "пакунки дл� задоволенн� залежно�тей. Де�кі пакунки мають відношенн�\n"
 "до інших так, що в�тановленн� пакунка вимагає, щоб інші програми також були\n"
 "в�тановлені. Програма в�тановленн� може визначити, �кі пакунки необхідні\n"
@@ -444,14 +448,14 @@ msgstr ""
 "запу�кати�� при �тарті �и�теми.\n"
 "\n"
 "При виборі �лужби по�вл�єть�� короткий тек�т з по��ненн�м про неї.\n"
-"Проте, �кщо Ви не впевнені, чи потрібно викори�товувати �ку�ь �лужбу,\n"
+"Проте, �кщо ви не впевнені, чи потрібно викори�товувати �ку�ь �лужбу,\n"
 "залишіть запропонований вибір.\n"
 "\n"
-"!! Будьте о�обливо уважними, �кщо Ви збираєте�ь викори�товувати цю\n"
+"!! Будьте о�обливо уважними, �кщо ви збираєте�ь викори�товувати цю\n"
 "�и�тему �к �ервер: можливо, не потрібно �тартувати �лужби, �кі Вам\n"
 "не потрібні. Пам'�тайте, будь ла�ка, що де�кі увімкнені �лужби можуть\n"
 "бути небезпечними на �ервері. Одним �ловом, вибирайте тільки ті �лужби,\n"
-"�кі Вам дій�но необхідні. !!"
+"�кі вам дій�но необхідні. !!"
 
 #: ../help.pm:209
 #, c-format
@@ -469,24 +473,24 @@ msgid ""
 "choose a time server located near you. This option actually installs a time\n"
 "server which can be used by other machines on your local network as well."
 msgstr ""
-"GNU/Linux оперує ча�ом по GMT (�ередній ча� по �рінвічу) і переводить\n"
-"його в мі�цевий ча� відповідно до ча�ового по��у, �кий Ви вказали.\n"
-"Якщо годинник на Вашій материн�ькій платі в�тановлено в локальний\n"
-"ча�, Ви можете відмінити \"%s\", що да�ть змогу GNU/Linux знати, що\n"
+"GNU/Linux оперує ча�ом GMT (�ередній ча� за Гринвічем) і переводить\n"
+"його в мі�цевий ча� відповідно до ча�ового по��у, �кий ви вказали.\n"
+"Якщо годинник на вашій материн�ькій платі в�тановлено в локальний\n"
+"ча�, ви можете відмінити «%s», що да�ть змогу GNU/Linux знати, що\n"
 "�и�темний годинник і апаратний годинник в�тановлені на один ча�овий\n"
 "по��. Це викори�товуєть��, коли машина також може завантажувати��\n"
 "в іншу операційну �и�тему.\n"
 "\n"
-"Параметр \"%s\" автоматично наводить годинник шл�хом під'єднанн� до\n"
-"віддаленого �ерверу ча�у в Інтернеті. Щоб ц� можливі�ть працювала, Ви\n"
-"повинні мати працююче з'єднанн� з Інтернетом. �айкраще вибрати �ервер\n"
-"ча�у, розташований біл� Ва�. Цей параметр в�тановлює �ервер ча�у, �кий\n"
-"також може викори�товувати�� іншими машинами у Вашій мі�цевій мережі."
+"Параметр «%s» автоматично наводить годинник шл�хом під'єднанн� до\n"
+"віддаленого �ерверу ча�у в інтернеті. Щоб ц� можливі�ть працювала, Ви\n"
+"повинні мати працююче з'єднанн� з інтернетом. �айкраще вибрати �ервер\n"
+"ча�у, розташований біл� ва�. Цей параметр в�тановлює �ервер ча�у, �кий\n"
+"також може викори�товувати�� іншими машинами у вашій мі�цевій мережі."
 
 #: ../help.pm:213
 #, c-format
 msgid "Hardware clock set to GMT"
-msgstr ""
+msgstr "�паратний годинник налаштовано на Гринвіч�ький ча�"
 
 #: ../help.pm:213
 #, c-format
@@ -509,15 +513,15 @@ msgstr ""
 "Графічна карта\n"
 "\n"
 "   Програма в�тановленн� в нормальному режимі автоматично знаходить\n"
-"і налаштовує графічну карту, в�тановлену на Вашій машині. Якщо цього не\n"
-"відбуваєть��, Ви можете вибрати із �пи�ку карту, �ку Ви в�тановили.\n"
+"і налаштовує графічну карту, в�тановлену на вашій машині. Якщо цього не\n"
+"відбуваєть��, ви можете вибрати із �пи�ку карту, �ку ви в�тановили.\n"
 "\n"
-"   У випадку, �кщо Ваша карта підтримує різні �ервери з або без\n"
-"3D-при�коренн�, Вам буде надана можливі�ть вибрати �ервер, �кий найбільше\n"
-"Вам підходить."
+"   У випадку, �кщо ваша карта підтримує різні �ервери з або без\n"
+"3D-при�коренн�, вам буде надано можливі�ть вибрати �ервер, �кий найбільше\n"
+"вам підходить."
 
 #: ../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"
@@ -577,19 +581,19 @@ msgid ""
 msgstr ""
 "X (дл� �и�теми X Window) є �ерцем графічного інтерфей�у GNU/Linux,\n"
 "від �кого залежать в�і графічні �ередовища (KDE, GNOME, AfterStep,\n"
-"WindowMaker, і т.і.), пов'�зані з Мандріва лінак�.\n"
+"WindowMaker тощо), пов'�зані з Mageia.\n"
 "\n"
-"Вам буде пред�тавлено �пи�ок різних параметрів дл� налаштуванн�,\n"
+"вам буде пред�тавлено �пи�ок різних параметрів дл� налаштуванн�,\n"
 "щоб отримати оптимальний графічний ди�плей.\n"
 "\n"
 "Графічна карта\n"
 "\n"
 "   Програма в�тановленн� автоматично визначає і налаштовує графічну\n"
-"карту, в�тановлену в машину. Якщо вона визначена неправильно, Ви можете\n"
+"карту, в�тановлену в машину. Якщо вона визначена неправильно, ви можете\n"
 "вибрати із �пи�ку карту, �ка дій�но в�тановлена.\n"
 "\n"
-"   У випадку, �кщо Ваша карта підтримує різні �ервери з або без 3D\n"
-"при�коренн�м, буде запропоновано вибрати �ервер, �кий Вам найбільше\n"
+"   У випадку, �кщо ваша карта підтримує різні �ервери з або без 3D\n"
+"при�коренн�м, буде запропоновано вибрати �ервер, �кий вам найбільше\n"
 "підходить.\n"
 "\n"
 "\n"
@@ -597,16 +601,16 @@ msgstr ""
 "Монітор\n"
 "\n"
 "   Програма в�тановленн� автоматично визначає і налаштовує монітор,\n"
-"під'єднаний до Вашої машини. Якщо це зроблено неправильно, Ви можете\n"
-"вибрати із �пи�ку монітор, �кий дій�но під'єднано до Вашого комп'ютера.\n"
+"під'єднаний до Вашої машини. Якщо це зроблено неправильно, ви можете\n"
+"вибрати із �пи�ку монітор, �кий дій�но під'єднано до вашого комп'ютера.\n"
 "\n"
 "\n"
 "\n"
 "Роздільна здатні�ть\n"
 "\n"
-"   Тут Ви можете вибрати роздільну здатні�ть і кількі�ть кольорів, �кі\n"
+"   Тут ви можете вибрати роздільну здатні�ть і кількі�ть кольорів, �кі\n"
 "підтримує Ваше обладнанн�. Підберіть величини, �кі найбільше Ва�\n"
-"влаштовують (Ви матимите змогу їх змінити пізніше). Зразок вибраного\n"
+"влаштовують (ви матимете змогу їх змінити пізніше). Зразок вибраного\n"
 "налаштуванн� буде показано на моніторі.\n"
 "\n"
 "\n"
@@ -616,20 +620,20 @@ msgstr ""
 "   В залежно�ті від обладнанн� цього пункту може не бути.\n"
 "\n"
 "   Си�тема �пробує відкрити графічний екран з вибраною роздільні�тю.\n"
-"Якщо Ви зможете побачити повідомленн� під ча� те�ту і відпові�те \"%s\",\n"
-"DrakX перейде до на�тупного кроку. Якщо Ви не зможете бачити\n"
+"Якщо ви зможете побачити повідомленн� під ча� те�ту і відпові�те «%s»,\n"
+"DrakX перейде до на�тупного кроку. Якщо ви не зможете бачити\n"
 "повідомленн�, це означатиме, що певна ча�тина автоматично визначеної\n"
 "конфігурації неправильна, те�т автоматично завершить�� через 12\n"
-"�екунд і Ви повернете�ь назад в меню. Змінюйте налаштуванн�, поки\n"
+"�екунд і ви повернете�ь назад в меню. Змінюйте налаштуванн�, поки\n"
 "не отримаєте коректний графічний ди�плей.\n"
 "\n"
 "\n"
 "\n"
 "Параметри\n"
 "\n"
-"   Тут Ви можете вибрати, чи хочете Ви, щоб Ваша машина автоматично\n"
+"   Тут ви можете вибрати, чи хочете Ви, щоб ваша машина автоматично\n"
 "перемикала�� в графічний інтерфей� при завантаженні. Зрозуміло, що\n"
-"Ви захочете вибрати \"%s\", �кщо Ваша машина є �ервером, або �кщо Ви\n"
+"ви захочете вибрати «%s», �кщо ваша машина є �ервером, або �кщо Ви\n"
 "не змогли у�пішно налаштувати ди�плей."
 
 #: ../help.pm:291
@@ -644,7 +648,7 @@ msgstr ""
 "Монітор\n"
 "\n"
 "   Програма в�тановленн� звичайно автоматично ви�вл�є і налаштовує монітор,\n"
-"під'єднаний до Вашої машини. Якщо вона це зробила неправильно, Ви можете\n"
+"під'єднаний до Вашої машини. Якщо вона це зробила неправильно, ви можете\n"
 "вибрати правильний монітор з цього �пи�ку."
 
 #: ../help.pm:298
@@ -659,8 +663,8 @@ msgid ""
 msgstr ""
 "Роздільна здатні�ть\n"
 "\n"
-"   Тут Ви можете вибрати роздільну здатні�ть і глибину кольору.\n"
-"Виберіть величини, �кі Ва� найбільше влаштовують (Ви зможете\n"
+"   Тут ви можете вибрати роздільну здатні�ть і глибину кольору.\n"
+"Виберіть величини, �кі Ва� найбільше влаштовують (ви зможете\n"
 "їх змінити пі�л� в�тановленн�). Зразок вибраного налаштуванн�\n"
 "буде показано на моніторі."
 
@@ -671,8 +675,8 @@ msgid ""
 "or without 3D acceleration, you're asked to choose the server which best\n"
 "suits your needs."
 msgstr ""
-"У випадку, �кщо Ваша карта підтримує різні �ервери, з або без 3D\n"
-"при�коренн�м, Вам буде запропоновано вибрати �ервер, �кий Вам\n"
+"У випадку, �кщо ваша карта підтримує різні �ервери, з або без 3D\n"
+"при�коренн�м, вам буде запропоновано вибрати �ервер, �кий Вам\n"
 "найбільше підходить."
 
 #: ../help.pm:311
@@ -688,39 +692,43 @@ msgstr ""
 "Параметри\n"
 "\n"
 "   Тут можна вказати, чи хочете Ви, щоб графічний інтерфей� вмикав��\n"
-"автоматично при завантаженні �и�теми. Вам потрібно вибрати \"%s\", �кщо\n"
-"Ваша машина буде працювати �ервером, або �кщо Ви не змогли у�пішно\n"
+"автоматично при завантаженні �и�теми. вам потрібно вибрати «%s», �кщо\n"
+"ваша машина буде працювати �ервером, або �кщо ви не змогли у�пішно\n"
 "налаштувати ди�плей."
 
 #: ../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 drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or "
+"if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -736,14 +744,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -756,67 +764,67 @@ 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 ""
-"Тепер потрібно вирішити, де �аме Ви б хотіли в�тановити �и�тему\n"
-"Мандріва лінак� на твердому ди�ку. Якщо твердий ди�к порожній, або\n"
+"Тепер потрібно вирішити, де �аме ви б хотіли в�тановити �и�тему\n"
+"Mageia на твердому ди�ку. Якщо твердий ди�к порожній, або\n"
 "�кщо і�нуюча операційна �и�тема викори�товує ве�ь про�тір, Вам\n"
 "потрібно буде перерозподілити ди�к. Фактично перерозподіл твердого\n"
 "ди�ку пол�гає в логічному його розділенні, щоб �творити мі�це дл�\n"
-"в�тановленн� Мандріва Лінак�а.\n"
+"в�тановленн� Mageiaа.\n"
 "\n"
-"Через те, що проце� перерозбитт� твердого ди�ку звичайно є\n"
+"Через те, що проце� перерозбитт� твердого ди�ка звичайно є\n"
 "незворотнім і може призве�ти до втрати даних, �кщо іншу операційну\n"
-"�и�тему вже було в�тановлено, ц� операці� може бути відл�куючою\n"
-"і �тре�овою, �кщо Ви є недо�відченим кори�тувачем. �а ща�т�, DrakX\n"
+"�и�тему вже було в�тановлено, ц� операці� може видати�� загрозливою\n"
+"і �тре�овою, �кщо ви є недо�відченим кори�тувачем. �а ща�т�, DrakX\n"
 "має помічника, �кий �прощує цей проце�. Перед продовженн�м цього\n"
 "кроку прочитайте до кінц� цього розділу і, що головне, приділіть трохи "
 "ча�у.\n"
 "\n"
-"В залежно�ті від конфігурації Вашого твердого ди�ку можливі кілька \n"
+"В залежно�ті від конфігурації вашого жор�ткого ди�ка можливі кілька \n"
 "варіантів продовженн�:\n"
 "\n"
-" * \"%s\". Цей режим виконує автоматичне розбитт� на розділи Вашого\n"
-"порожнього ди�ку (ди�ків). Якщо Ви вибрали цю команду, інших\n"
+" * «%s». Цей режим виконує автоматичне розбитт� на розділи Вашого\n"
+"порожнього ди�ку (ди�ків). Якщо ви вибрали цю команду, інших\n"
 "запитань до Ва� вже не буде.\n"
 "\n"
-" * \"%s\". Помічник ви�вив один або більше розділів Лінак� на Вашому\n"
-"твердому ди�ку. Якщо Ви хочете викори�тати їх, виберіть цей режим.\n"
-"Тоді Вам буде запропоновано вказати відповідні до кожного розділу точки\n"
+" * «%s». Помічник ви�вив один або більше розділів Linux на Вашому\n"
+"твердому ди�ку. Якщо ви хочете викори�тати їх, виберіть цей режим.\n"
+"Тоді вам буде запропоновано вказати відповідні до кожного розділу точки\n"
 "монтуванн�. Попередні точки монтуванн� будуть показані типово і у\n"
 "більшо�ті випадків залишити їх без змін буде прийн�тним варіантом.\n"
 "\n"
-" * \"%s\". Якщо на Вашому твердому ди�ку в�тановлено Microsoft Windows\n"
-"і він займає ве�ь про�тір на ньому, Вам потрібно буде �творити вільне\n"
-"мі�це дл� Лінак�а. Щоб зробити це, Ви можете �терти в�і розділи Microsoft\n"
+" * «%s». Якщо на Вашому твердому ди�ку в�тановлено Microsoft Windows\n"
+"і він займає ве�ь про�тір на ньому, вам потрібно буде �творити вільне\n"
+"мі�це дл� Linux. Щоб зробити це, ви можете �терти в�і розділи Microsoft\n"
 "Windows і дані (диви�ь команду \"Стерти ве�ь ди�к\"), або змінити розмір\n"
 "розділу Microsoft Windows FAT або NTFS. Зміна розміру буде здій�нена\n"
 "без втрати будь �ких даних, �кі знаход�ть�� на попередньо\n"
 "дефрагментованому розділі Windows. Дуже рекомендуєть�� зробити\n"
 "резервну копію Ваших даних. Викори�танн� цього режиму\n"
-"рекомендуєть��, �кщо Ви хочете викори�товувати Мандріва Лінак� \n"
+"рекомендуєть��, �кщо ви хочете викори�товувати Mageia \n"
 "і Майкро�офт Віндов� на одному комп'ютері.\n"
 "\n"
 "   Перед вибором цього режиму зрозумійте, що пі�л� виконанн� цієї\n"
 "процедури розмір розділу Microsoft Windows �тане меншим, ніж до\n"
-"цього. Ви будете мати менше вільного мі�ц� у Microsoft Windows на\n"
+"цього. ви будете мати менше вільного мі�ц� у Microsoft Windows на\n"
 "зберіганн� даних і в�тановленн� нових програм.\n"
 "\n"
-" * \"%s\". Якщо Ви хочете �терти в�і дані і в�і розділи, �кі є на твердому\n"
-"ди�ку і замінити їх новою �и�темою Мандріва Лінак�,\n"
+" * «%s». Якщо ви хочете �терти в�і дані і в�і розділи, �кі є на твердому\n"
+"ди�ку і замінити їх новою �и�темою Mageia,\n"
 "виберіть цей режим. Будьте уважні, бо підтвердивши цей\n"
-"вибір, Ви вже не зможете повернути�ь назад.\n"
+"вибір, ви вже не зможете повернути�ь назад.\n"
 "\n"
-"   !! Якщо Ви виберете цей режим, в�і дані на твердому ди�ку будуть "
+"   !! Якщо ви виберете цей режим, в�і дані на твердому ди�ку будуть "
 "видалені. !!\n"
 "\n"
-" * \"%s\". Це про�то зітре повні�тю ве�ь ди�к і почне новий\n"
+" * «%s». Це про�то зітре повні�тю ве�ь ди�к і почне новий\n"
 "поділ на розділи. В�і дані на ди�ку буде втрачено.\n"
 "\n"
-"!! Якщо Ви виберете цей режим, в�і дані на ди�ку будуть втрачені. !!\n"
+"!! Якщо ви виберете цей режим, в�і дані на ди�ку будуть втрачені. !!\n"
 "\n"
-" * \"%s\". Виберіть цей режим, �кщо Ви хочете вручну перерозподілити\n"
+" * «%s». Виберіть цей режим, �кщо ви хочете вручну перерозподілити\n"
 "про�тір на Вашому твердому ди�ку. Однак будьте обережними, це --\n"
-"потужний, але дуже небезпечний вибір, Ви можете дуже легко втратити\n"
-"в�і дані. Тому цей режим на�правді рекомендуєть�� тоді, �кщо Ви вже\n"
+"потужний, але дуже небезпечний вибір, ви можете дуже легко втратити\n"
+"в�і дані. Тому цей режим на�правді рекомендуєть�� тоді, �кщо ви вже\n"
 "що�ь подібне робили або маєте певний до�від. Дл� детальнішої інформації,\n"
 "�к викори�товувати ін�трумент DiskDrake, звертайте�� до розділу\n"
 "\"Managing Your Partitions\" в \"Starter Guide\"."
@@ -829,7 +837,7 @@ msgstr "Викори�товувати і�нуючий розділ"
 #: ../help.pm:370
 #, c-format
 msgid "Use the free space on the Microsoft Windows® partition"
-msgstr ""
+msgstr "Викори�товувати вільний про�тір на розділі Microsoft Windows®"
 
 #: ../help.pm:370
 #, c-format
@@ -873,38 +881,38 @@ msgid ""
 "\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
 "/dev/fd0\"."
 msgstr ""
-"О�ь і в�е. В�тановленн� завершене і Ваша �и�тема GNU/Linux готова\n"
-"до викори�танн�. Про�то нати�ніть \"%s\" дл� перезавантаженн�.\n"
-"�е забудьте вийн�ти но�ії (КД або ди�кету). Перше, що Ви побачите\n"
+"О�ь і в�е. В�тановленн� завершене і ваша �и�тема GNU/Linux готова\n"
+"до викори�танн�. Про�то нати�ніть «%s» дл� перезавантаженн�.\n"
+"�е забудьте вийн�ти но�ії (КД або ди�кету). Перше, що ви побачите\n"
 "пі�л� завершенн� �и�темою те�тів обладнанн�, буде меню\n"
-"завантажувача, �ке запропонує Вам вибір операційної �и�теми\n"
+"завантажувача, �ке запропонує вам вибір операційної �и�теми\n"
 "дл� запу�ку.\n"
 "\n"
-"Кнопка \"%s\"покаже дві інші кнопки:\n"
+"Кнопка «%s»покаже дві інші кнопки:\n"
 "\n"
-" * \"%s\": дозвол�є �творити ди�кету дл� в�тановленн�, �ка автоматично,\n"
+" * «%s»: дозвол�є �творити ди�кету дл� в�тановленн�, �ка автоматично,\n"
 "без допомоги оператора виконає в�е в�тановленн�, подібне до того, �ке\n"
-"Ви щойно зробили.\n"
+"ви щойно зробили.\n"
 "\n"
 "   Зауважте, що пі�л� нати�ненн� на кнопку будуть можливі два різні\n"
 "параметри:\n"
 "\n"
-"    * \"%s\". Це ча�тково автоматизоване в�тановленн�. В режимі\n"
+"    * «%s». Це ча�тково автоматизоване в�тановленн�. В режимі\n"
 "діалогу відбуваєть�� тільки етап розбитт� на розділи.\n"
 "\n"
-"    * \"%s\". Повні�тю автоматизоване в�тановленн�: твердий ди�к\n"
+"    * «%s». Повні�тю автоматизоване в�тановленн�: твердий ди�к\n"
 "повні�тю перезапи�уєть��, в�і дані втрачають��.\n"
 "\n"
 "   Цей параметр є дуже зручним при в�тановленні на багато подібних\n"
 "машин. Дивіть�� розділ Auto install на нашому веб-�айті дл� детальної\n"
 "інформації.\n"
 "\n"
-" * \"%s\"(*): зберігає �пи�ок пакунків, вибраних при цьому в�тановленні.\n"
+" * «%s»(*): зберігає �пи�ок пакунків, вибраних при цьому в�тановленні.\n"
 "Щоб викори�тати цей вибір при іншому в�тановленні, в�тавте ди�кету і\n"
 "запу�тіть в�тановленн�. При підказці нати�ніть клавішу [F1] і введіть\n"
 ">>linux defcfg=\"floppy\" << і нати�ніть [Enter].\n"
 "\n"
-"(*) Вам потрібно мати ди�кету у FAT-форматі. Щоб �творити таку в\n"
+"(*) вам потрібно мати ди�кету у FAT-форматі. Щоб �творити таку в\n"
 "GNU/Linux, введіть \"mformat a:\", або \"fdformat /dev/fd0\", а пі�л� цього\n"
 "\"mkfs.vfat /dev/fd0\"."
 
@@ -916,20 +924,20 @@ msgstr "Створити ди�кету дл� автоматичного в�т
 #: ../help.pm:405
 #, c-format
 msgid "Replay"
-msgstr ""
+msgstr "Повторити"
 
 #: ../help.pm:405
 #, c-format
 msgid "Automated"
-msgstr ""
+msgstr "�втоматично"
 
 #: ../help.pm:405
 #, c-format
 msgid "Save packages selection"
-msgstr ""
+msgstr "Зберегти перелік пакунків"
 
 #: ../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"
@@ -953,32 +961,32 @@ msgid ""
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
-"Якщо Ви вирішили викори�товувати де�кі з і�нуючих розділів\n"
+"Якщо ви вирішили викори�товувати де�кі з і�нуючих розділів\n"
 "GNU/Linux, можливо, захочете переформатувати де�кі з них\n"
 "дл� того, щоб �терти дані, �кі на них запи�ані. Якщо Ви\n"
 "хочете це зробити, виберіть також розділи, �кі хочете\n"
 "відформатувати.\n"
 "\n"
 "Зауважте, однак, що не обов'�зково форматувати в�і розділи, �кі\n"
-"і�нували раніше. Ви повинні відформатувати розділи, �кі мі�т�ть\n"
+"і�нували раніше. ви повинні відформатувати розділи, �кі мі�т�ть\n"
 "операційну �и�тему (такі, �к \"/\", \"/usr\" чи \"/var\"), але не му�ите\n"
-"форматувати ті розділи, �кі мі�т�ть дані, �кі Ви б хотіли зберегти\n"
+"форматувати ті розділи, �кі мі�т�ть дані, �кі ви б хотіли зберегти\n"
 "(типово це розділ \"/home\").\n"
 "\n"
 "Будьте уважні з вибором розділів. Пі�л� форматуванн� в�і дані на\n"
 "вибраних розділах будуть �терті і їх вже не можна буде відновити.\n"
 "\n"
-"�ати�ніть на \"%s\", коли будете готові при�тупити до форматуванн�\n"
+"�ати�ніть на «%s», коли будете готові при�тупити до форматуванн�\n"
 "розділів.\n"
 "\n"
-"�ати�ніть на \"%s\", �кщо Ви хочете вибрати інші розділи дл�\n"
-"того, щоб в�тановити нову �и�тему Мандріва лінак�.\n"
+"�ати�ніть на «%s», �кщо ви хочете вибрати інші розділи дл�\n"
+"того, щоб в�тановити нову �и�тему Mageia.\n"
 "\n"
-"�ати�ніть на \"%s\", �кщо Ви хочете вибрати розділи дл�\n"
+"�ати�ніть на «%s», �кщо ви хочете вибрати розділи дл�\n"
 "перевірки на і�нуванн� збійних блоків."
 
 #: ../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"
@@ -992,20 +1000,20 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Коли Ви в�тановлюєте Мандріва лінак�, де�кі пакунки можуть\n"
-"бути поновлені з ча�у виходу ди�трибутиву. Можуть бути виправлені\n"
+"Коли ви в�тановлюєте Mageia, де�кі пакунки можуть\n"
+"бути поновлені з ча�у виходу ди�трибутива. Можуть бути виправлені\n"
 "помилки, вирішені проблеми безпеки. Щоб мати кори�ть від цих поновлень,\n"
-"зараз Ви можете звантажити їх з Інтернету. Перевірте \"%s\", �кщо маєте\n"
-"зв'�зок з Інтернетом, або \"%s\", �кщо бажаєте в�тановити поновлені пакунки\n"
+"зараз ви можете звантажити їх з інтернету. Перевірте «%s», �кщо маєте\n"
+"зв'�зок з інтернетом, або «%s», �кщо бажаєте в�тановити поновлені пакунки\n"
 "пізніше.\n"
 "\n"
-"Вибравши \"%s\", Ви побачите �пи�ок адре�, звідки можуть бути вз�ті\n"
-"поновленн�. Вам потрібно вибрати �кі�ь із найближчих до Ва�. По�вить��\n"
-"дерево вибору пакунків: зробіть вибір і нати�ніть \"%s\", щоб звантажити\n"
-"і в�тановити їх, або \"%s\", щоб вийти."
+"Вибравши «%s», ви побачите �пи�ок адре�, звідки можуть бути вз�ті\n"
+"поновленн�. вам потрібно вибрати �кі�ь із найближчих до ва�. Буде показано\n"
+"дерево вибору пакунків: зробіть вибір і нати�ніть «%s», щоб звантажити\n"
+"і в�тановити їх, або «%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"
@@ -1020,18 +1028,18 @@ msgid ""
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
 "security. Security messages will be sent to that address."
 msgstr ""
-"В цьому мі�ці DrakX да�ть Вам можливі�ть вибрати рівень безпеки\n"
+"В цьому мі�ці DrakX да�ть вам можливі�ть вибрати рівень безпеки\n"
 "дл� Вашої �и�теми. �а практиці можна викори�товувати таке правило:\n"
 "рівень безпеки повинен бути вищий, �кщо на машині зберігатимуть��\n"
-"важливі дані, або �кщо вона буде безпо�ередньо під'єднана до Інтернету.\n"
+"важливі дані, або �кщо вона буде безпо�ередньо під'єднана до інтернету.\n"
 "Платою за вищий рівень безпеки у більшо�ті випадків є легкі�ть у\n"
 "викори�танні.\n"
 "\n"
-"Якщо Ви не знаєте, на чому зупинити�ь, залиште в�е, �к є. Ви зможете\n"
+"Якщо ви не знаєте, на чому зупинити�ь, залиште в�е, �к є. ви зможете\n"
 "змінити рівень безпеки пізніше з допомогою ін�трументу draksec з \n"
-"Центру керуванн� Мандріва.\n"
+"Центру керуванн� Mageia.\n"
 "\n"
-"Поле \"%s\" може викори�товувати�� дл� �повіщенн� кори�тувача, �кий\n"
+"Поле «%s» може викори�товувати�� дл� �повіщенн� кори�тувача, �кий\n"
 "відповідає за безпеку. Повідомленн� відправл�тиметь�� на вказану адре�у."
 
 #: ../help.pm:461
@@ -1040,24 +1048,27 @@ msgid "Security Administrator"
 msgstr "�дміні�тратор з безпеки"
 
 #: ../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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1073,21 +1084,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1104,73 +1117,67 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
-"Зараз Вам потрібно вибрати, �кі розділи викори�товувати дл� в�тановленн�\n"
-"Вашої нової �и�теми Мандріва лінак�. Якщо ці розділи вже були �творені\n"
+"Зараз вам потрібно вибрати, �кі розділи викори�товувати дл� в�тановленн�\n"
+"Вашої нової �и�теми Mageia. Якщо ці розділи вже були �творені\n"
 "при попередньому в�тановленні �и�теми GNU/Linux, або �творені іншою\n"
-"програмою розподілу ди�ку, Ви можете �кори�тати�� вже і�нуючими\n"
+"програмою розподілу ди�ку, ви можете �кори�тати�� вже і�нуючими\n"
 "розділами. В іншому випадку потрібно �творити розділи на твердому ди�ку.\n"
 "\n"
-"Щоб �творити розділи, Вам потрібно вибрати твердий ди�к. Ви можете\n"
+"Щоб �творити розділи, вам потрібно вибрати твердий ди�к. ви можете\n"
 "вибрати ди�к, клацнувши на \"hda\" дл� першого ди�ку типу IDE,\n"
-"\"hdb\" дл� другого ди�ку типу IDE, \"sda\", �кщо Ви будете в�тановлювати\n"
+"\"hdb\" дл� другого ди�ку типу IDE, \"sda\", �кщо ви будете в�тановлювати\n"
 "�и�тему на першому ди�ку типу SCSI і так далі.\n"
 "\n"
-"Щоб розбити ди�к на розділи, Ви можете �кори�тати�� такими командами:\n"
+"Щоб розбити ди�к на розділи, ви можете �кори�тати�� такими командами:\n"
 "\n"
-" * \"%s\": видал�є в�і розділи на вибраному твердому ди�ку\n"
+" * «%s»: вилучає в�і розділи на вибраному твердому ди�ку\n"
 "\n"
-" * \"%s\": ц� команда автоматично �творить розділи типу ext3 та swap\n"
+" * «%s»: ц� команда автоматично �творить розділи типу ext4 та swap\n"
 "на вільному мі�ці ди�ку\n"
 "\n"
-"\"%s\": дає до�туп до додаткових параметрів:\n"
+"«%s»: дає до�туп до додаткових параметрів:\n"
 "\n"
-" * \"%s\": запи�ує таблицю розділів на ди�кету. Викори�товуєть�� дл�\n"
+" * «%s»: запи�ує таблицю розділів на ди�кету. Викори�товуєть�� дл�\n"
 "відновленн� таблиці розділів при потребі. Дуже рекомендуєть�� виконувати\n"
 "цей крок.\n"
 "\n"
-" * \"%s\": дає змогу Вам відновити раніше запи�ану таблицю розділів з\n"
+" * «%s»: дає змогу вам відновити раніше запи�ану таблицю розділів з\n"
 "ди�кети.\n"
 "\n"
-" * \"%s\": �кщо таблиц� розділів Вашого ди�ку пошкоджена, Ви можете\n"
+" * «%s»: �кщо таблиц� розділів вашого ди�ку пошкоджена, ви можете\n"
 "�пробувати відновити її, �кори�тавши�ь цією командою. Будь ла�ка,\n"
 "будьте обережними і пам'�тайте, що ц� команда не завжди �працьовує.\n"
 "\n"
-" * \"%s\": відмовити�� від в�іх змін і завантажити таблицю розділів, �ка\n"
+" * «%s»: відмовити�� від в�іх змін і завантажити таблицю розділів, �ка\n"
 "була на Вашому твердому ди�ку.\n"
 "\n"
-" * \"%s\": відміна цього параметра зробить необхідним монтуванн� і\n"
+" * «%s»: відміна цього параметра зробить необхідним монтуванн� і\n"
 "розмонтуванн� знімних но�іїв - ди�кети і компакт-ди�ку - кори�тувачами\n"
 "вручну.\n"
 "\n"
-" * \"%s\": викори�тайте цю команду, �кщо Ви хочете, щоб помічник розподілив\n"
-"Ваш ди�к. Рекомендуєть��, �кщо Ви не розумієте�ь добре про\n"
+" * «%s»: викори�тайте цю команду, �кщо ви хочете, щоб помічник розподілив\n"
+"ваш ди�к. Рекомендуєть��, �кщо ви не розумієте�ь добре про\n"
 "розподіл ди�ку. \n"
 "\n"
-" * \"%s\": викори�тайте цю команду, щоб �ка�увати в�і зміни.\n"
+" * «%s»: викори�тайте цю команду, щоб �ка�увати в�і зміни.\n"
 "\n"
-" * \"%s\": дозволити додаткові дії при розбиванні (тип, параметри, формат)\n"
+" * «%s»: дозволити додаткові дії при розбиванні (тип, параметри, формат)\n"
 "і отримати більше інформації про твердий ди�к.\n"
 "\n"
-" * \"%s\": ц� команда запише зміни на ди�к пі�л� того, �к Ви закінчите "
+" * «%s»: ц� команда запише зміни на ди�к пі�л� того, �к ви закінчите "
 "розбитт�\n"
-"Вашого твердого ди�ку. \n"
+"вашого жор�ткого ди�ка. \n"
 "\n"
-"Коли Ви задаєте розмір розділу, можете точніше задати розмір,\n"
+"Коли ви задаєте розмір розділу, можете точніше задати розмір,\n"
 "викори�товуючи клавіші кур�ора на клавіатурі.\n"
 "\n"
-"Примітка: Ви можете виконати будь-�ку команду з клавіатури. Переміщайте��\n"
+"Примітка: ви можете виконати будь-�ку команду з клавіатури. Переміщайте��\n"
 "по розділах з допомогою клавіш [Tab] і [Up/Down].\n"
 "\n"
-"Коли певний розділ вибрано, Ви можете викори�товувати:\n"
+"Коли певний розділ вибрано, ви можете викори�товувати:\n"
 "\n"
 " * Ctrl-c, щоб �творити новий розділ (�кщо вибрано порожній розділ)\n"
 "\n"
@@ -1178,30 +1185,23 @@ msgstr ""
 "\n"
 " * Ctrl-m, щоб в�тановити точку монтуванн�\n"
 "\n"
-"Щоб отримати інформацію про різні типи файлових �и�тем, �кі Ви можете\n"
+"Щоб отримати інформацію про різні типи файлових �и�тем, �кі ви можете\n"
 "�творити, прочитайте розділ ext2FS з \"Reference Manual\".\n"
-"\n"
-"Якщо Ви в�тановлюєте �и�тему на комп'ютер з проце�ором PPC, можете\n"
-"�творити маленький розділ типу HFS дл� завантаженн� 'bootstrap'\n"
-"(розміром не менше 1Мб) дл� завантажувача yaboot. Якщо Ви вирішите\n"
-"�творити розділ трохи більшого розміру, �кажімо 50Мб, Ви зможете\n"
-"також зберігати на ньому резервне �дро �и�теми та віртуальний ди�к дл�\n"
-"аварійних завантажень �и�теми. "
 
 #: ../help.pm:526
 #, c-format
 msgid "Save partition table"
-msgstr ""
+msgstr "Зберегти таблицю розділів"
 
 #: ../help.pm:526
 #, c-format
 msgid "Restore partition table"
-msgstr ""
+msgstr "Відновити таблицю розділів"
 
 #: ../help.pm:526
 #, c-format
 msgid "Rescue partition table"
-msgstr ""
+msgstr "Виправити таблицю розділів"
 
 #: ../help.pm:526
 #, c-format
@@ -1211,12 +1211,12 @@ msgstr "�втоматичне монтуванн� змінних но�іїв"
 #: ../help.pm:526
 #, c-format
 msgid "Wizard"
-msgstr ""
+msgstr "Май�тер"
 
 #: ../help.pm:526
 #, c-format
 msgid "Undo"
-msgstr ""
+msgstr "Вернути"
 
 #: ../help.pm:526
 #, c-format
@@ -1224,53 +1224,57 @@ msgid "Toggle between normal/expert mode"
 msgstr "Перемикнути між режимами Ек�перт/Звичайний"
 
 #: ../help.pm:536
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
-"�а Вашому ди�ку знайдено більше одного розділа Майкро�офт.\n"
-"Виберіть, будь ла�ка, розмір �кого з них Ви хотіли б змінити, дл�\n"
-"того, щоб в�тановити операційну �и�тем Мандріва лінак�.\n"
+"�а Вашому ди�ку знайдено більше одного розділу Microsoft.\n"
+"Виберіть, будь ла�ка, розмір �кого з них ви хотіли б змінити, дл�\n"
+"того, щоб в�тановити операційну �и�тем Mageia.\n"
 "\n"
-"Кожен розділ подано в такому вигл�ді: \"�азва в Лінак�і\", \"�азва у\n"
-"Віндов�\", \"Розмір\".\n"
+"Кожен розділ подано в такому вигл�ді: \"�азва в Linux\", \"�азва у\n"
+"Windows\", \"Розмір\".\n"
 "\n"
-"\"�азва в Лінак�і\" подана таким чином: \"тип твердого ди�ку\",\n"
-"\"номер твердого ди�ку\", \"номер розділу на ди�ку\", (наприклад:\n"
+"\"�азва в Linux\" подана таким чином: \"тип твердого ди�ка\",\n"
+"\"номер жор�ткого ди�ка\", \"номер розділу на ди�ку\", (наприклад:\n"
 "\"hda1\").\n"
 "\n"
-"Тип твердого ди�ку\" - це \"hd\", �кщо Ви маєте ди�к типу IDE, і \"sd\",\n"
-"�кщо Ви маєте твердий ди�к типу SCSI.\n"
+"Тип жор�ткого ди�ка\" - це \"hd\", �кщо ви маєте ди�к типу IDE, і \"sd\",\n"
+"�кщо ви маєте твердий ди�к типу SCSI.\n"
 "\n"
-"\"�омер твердого ди�ку\" - це завжди літера пі�л� \"hd\" чи \"sd\". Дл�\n"
+"\"�омер жор�ткого ди�ка\" - це завжди літера пі�л� \"hd\" чи \"sd\". Дл�\n"
 "ди�ків типу IDE це:\n"
 "\n"
 "    * \"a\" - головний ди�к (master) на першому контролері IDE,\n"
@@ -1285,7 +1289,7 @@ msgstr ""
 "Ñ–\n"
 "т.д. ...\n"
 "\n"
-"\"�азва у Віндов�\" - це літера Вашого твердого ди�ку, �к Ви її бачите\n"
+"\"�азва у Віндов�\" - це літера вашого жор�ткого ди�ка, �к ви її бачите\n"
 "при роботі у Віндов� (перший ди�к чи розділ називаєть�� \"C:\")."
 
 #: ../help.pm:567
@@ -1296,13 +1300,13 @@ msgid ""
 "the\n"
 "list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
-"\"%s\": перевірити поточний вибір країни. Якщо Ви знаходите�ь не\n"
-"в цій країні, нати�ніть кнопку \"%s\" і виберіть іншу країну. Якщо Вашої\n"
-"країни немає в першому переліку, нати�ніть \"%s\", щоб отримати повний\n"
+"«%s»: перевірити поточний вибір країни. Якщо ви знаходите�ь не\n"
+"в цій країні, нати�ніть кнопку «%s» і виберіть іншу країну. Якщо Вашої\n"
+"країни немає в першому переліку, нати�ніть «%s», щоб отримати повний\n"
 "�пи�ок країн."
 
 #: ../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"
@@ -1313,8 +1317,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1325,26 +1330,26 @@ msgid ""
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mageia version \"8.1\" is not recommended."
 msgstr ""
-"Цей крок виконуєть�� тільки у випадку, �кщо на Вашій машині було\n"
+"Цей крок виконуєть�� тільки у випадку, �кщо на вашій машині було\n"
 "знайдено �тарий розділ GNU/Linux.\n"
 "\n"
-"DrakX зараз потрібно знати, чи Ви хочете виконати нове в�тановленн�,\n"
-"чи поновити і�нуючу �и�тему Мандріва лінак�:\n"
+"DrakX зараз потрібно знати, чи ви хочете виконати нове в�тановленн�,\n"
+"чи поновити і�нуючу �и�тему Mageia:\n"
 "\n"
-" * \"%s\": В більшій ча�тині це повні�тю знищує �тару �и�тему. Якщо Ви\n"
-"хочете змінити розбитт� твердого ди�ку на розділи або змінити файлову\n"
+" * «%s»: В більшій ча�тині це повні�тю знищує �тару �и�тему. Якщо Ви\n"
+"хочете змінити розбитт� жор�ткого ди�ка на розділи або змінити файлову\n"
 "�и�тему, викори�товуйте цей параметр. Проте в залежно�ті від �хеми\n"
-"розбитт� на розділи Ви можете оберегти де�кі з і�нуючих даних від\n"
+"розбитт� на розділи ви можете оберегти де�кі з і�нуючих даних від\n"
 "перепи�уванн�.\n"
 "\n"
-" * \"%s\": цей тип в�тановленн� дозвол�є Вам поновити пакунки, вже\n"
-"в�тановлені на Вашій �и�темі Мандріва лінак�. Ваша і�нуюча �хема\n"
+" * «%s»: цей тип в�тановленн� дозвол�є вам поновити пакунки, вже\n"
+"в�тановлені на вашій �и�темі Mageia. ваша і�нуюча �хема\n"
 "розбитт� на розділи і дані кори�тувачів не змінюють��. Більші�ть інших\n"
 "кроків в�тановленн� залишають��, подібно до �тандартного в�тановленн�.\n"
 "\n"
 "Викори�танн� параметра \"Поновленн�\" працюватиме на �и�темах з\n"
-"Мандріва лінак� вер�ії \"8.1\" і пізніших. Виконанн� поновленн� вер�ій,\n"
-"попередніх до Мандріва лінак� \"8.1\" не рекомендуєть��."
+"Mageia вер�ії \"8.1\" і пізніших. Виконанн� поновленн� вер�ій,\n"
+"попередніх до Mageia \"8.1\" не рекомендуєть��."
 
 #: ../help.pm:594
 #, c-format
@@ -1366,27 +1371,27 @@ msgid ""
 "dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
-"В залежно�ті від типової мови, �ку Ви вказали у розділі, drakX\n"
+"В залежно�ті від типової мови, �ку ви вказали у розділі, drakX\n"
 "автоматично вибере певний тип конфігурації клавіатури. Перевірте,\n"
 "щоб виділенн� відповідало Вашому вибору, �кщо потрібно, виберіть\n"
 "відповідну мапу.\n"
 "\n"
-"Проте, може не і�нувати мапи клавіатури, що точно відповідає Вашій мові:\n"
-"наприклад, �кщо Ви англомовний швейцарець, Ви в�е одно можете\n"
-"забажати кори�тувати�ь швейцар�ькою мапою. �бо, �кщо Ви говорите\n"
-"англій�ькою, але живете в Квебеку, Ви потрапл�єте в аналогічну\n"
-"�итуацію, коли Ваша рідна мова і мапа клавіатури не �півпадають. В\n"
-"таких випадках цей крок в�тановленн� да�ть Вам змогу вибрати\n"
+"Проте, може не і�нувати мапи клавіатури, що точно відповідає вашій мові:\n"
+"наприклад, �кщо ви англомовний швейцарець, ви в�е одно можете\n"
+"забажати кори�тувати�ь швейцар�ькою мапою. �бо, �кщо ви говорите\n"
+"англій�ькою, але живете в Квебеку, ви потрапл�єте в аналогічну\n"
+"�итуацію, коли ваша рідна мова і мапа клавіатури не �півпадають. В\n"
+"таких випадках цей крок в�тановленн� да�ть вам змогу вибрати\n"
 "відповідну клавіатуру з наданого �пи�ку.\n"
 "\n"
-"�ати�ніть кнопку \"%s\", щоб побачити повний �пи�ок мап клавіатур.\n"
+"�ати�ніть кнопку «%s», щоб побачити повний �пи�ок мап клавіатур.\n"
 "\n"
-"Якщо Ви вибрали мапу, що о�нована на нелатин�ькому алфавіті,\n"
+"Якщо ви вибрали мапу, що о�нована на нелатин�ькому алфавіті,\n"
 "на�тупний діалог да�ть змогу вибрати комбінацію клавіш, �ка\n"
 "перемикатиме клавіатуру між латин�ькою і нелатин�ькою мапами."
 
 #: ../help.pm:612
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1430,40 +1435,39 @@ msgid ""
 msgstr ""
 "Перший крок - вибір мови.\n"
 "\n"
-"Ваш вибір мови вплине на мову документації, програми в�тановленн�\n"
-"і �и�тему в цілому. Спочатку виберіть регіон, в �кому Ви знаходите�ь,\n"
-"потім мову, �кою Ви розмовл�єте.\n"
+"ваш вибір мови вплине на мову документації, програми в�тановленн�\n"
+"і �и�тему в цілому. Спочатку виберіть регіон, в �кому ви знаходите�ь,\n"
+"потім мову, �кою ви розмовл�єте.\n"
 "\n"
-"�ати�нувши кнопку \"%s\" Ви зможете вибрати інші мови, �кі можна\n"
-"в�тановити на Вашій робочій �танції, при цьому в�тановлюють�� о�обливі\n"
+"�ати�нувши кнопку «%s», ви зможете вибрати інші мови, �кі можна\n"
+"в�тановити на вашій робочій �танції, при цьому в�тановлюють�� о�обливі\n"
 "дл� мови файли �и�темної документації і програми. �априклад, �кщо\n"
 "в �и�темі будуть працювати кори�тувачі з І�панії, виберіть англій�ьку\n"
-"мову типовою з дерева перегл�ду і \"%s\" в розділі Додатково.\n"
+"мову типовою з дерева перегл�ду і «%s» в розділі «Додатково».\n"
 "\n"
-"Кілька �лів про підтримку UTF-8 (юнікоду): Юнікод - це нове кодуванн�\n"
-"�имволів, �ке вміщує у�і мови. Повна підтримка дл� GNU/Linux в�е ще\n"
-"знаходить�� в �тадії розробки. Через це Мандріва лінак�\n"
+"Кілька �лів про підтримку UTF-8 (юнікоду): Unicode — це нове кодуванн�\n"
+"�имволів, �ке мі�тить �имволи в�іх мов. Повна підтримка дл� GNU/Linux\n"
+"в�е ще перебуває у �тадії розробки. Через це Mageia\n"
 "викори�товуватиме його залежно від вибору кори�тувача:\n"
 "\n"
-" * Якщо Ви вибрали мови із традиційним кодуванн�м (мови latin1\n"
+" * Якщо ви вибрали мови із традиційним кодуванн�м (мови latin1\n"
 "Україн�ька, Япон�ька, Китай�ька, Корей�ька, Тай�ька, Грецька,\n"
 "Турецька, більші�ть мов iso-8859-2), це кодуванн� і\n"
 "викори�товуватиметь��;\n"
 "\n"
 " * Інші мови викори�товуватимуть юнікод типово;\n"
 "\n"
-" * Якщо вибираєть�� підтримка двох чи більше мов і вони не\n"
-"викори�товують однакове кодуванн�, юнікод викори�товуватиметь��\n"
-"дл� в�ієї �и�теми;\n"
+" * Якщо вибрано підтримку двох або декількох мов з різним\n"
+"кодуванн�м, юнікод викори�товуватиметь�� дл� в�ієї �и�теми;\n"
 "\n"
 " * �арешті, незалежно від вибраної мови юнікод також\n"
 "викори�товуватиметь�� дл� �и�теми у випадку, �кщо кори�тувач\n"
-"вказав \"%s\".\n"
+"вказав «%s».\n"
 "\n"
-"Зауважте, що Ви не обмежені вибором однієї додаткової мови. Ви\n"
-"можете вибрати їх кілька або в�тановити їх в�і, вибравши пункт \"%s\".\n"
+"Зауважте, що ви не обмежені вибором однієї додаткової мови. Ви\n"
+"можете вибрати їх кілька або в�тановити їх в�і, вибравши пункт «%s».\n"
 "Вибір підтримки мови означає вибір перекладів, шрифтів, перевірку\n"
-"орфографії і т.д.\n"
+"орфографії тощо.\n"
 "\n"
 "Дл� перемиканн� між різними мовами, в�тановленими в �и�темі, можете\n"
 "виконати команду \"/usr/sbin/localedrake\" з правами \"root\", щоб змінити\n"
@@ -1478,7 +1482,7 @@ msgstr "І�пан�ька"
 #: ../help.pm:643
 #, c-format
 msgid "Use Unicode by default"
-msgstr ""
+msgstr "Типово викори�товувати Unicode"
 
 #: ../help.pm:646
 #, c-format
@@ -1517,24 +1521,24 @@ msgid ""
 "move your mouse about."
 msgstr ""
 "Здебільшого DrakX не має проблем при визначенні кілько�ті кнопок на\n"
-"Вашій миші. Якщо це �таєть��, приймаєть��, що Ви маєте двохкнопкову\n"
+"вашій миші. Якщо це �таєть��, приймаєть��, що ви маєте двохкнопкову\n"
 "мишу, і можете �конфігурувати її дл� емул�ції третьої кнопки. Трет�\n"
 "кнопка на двохкнопковій миші може бути \"нати�нута\" одноча�ним\n"
 "нати�канн�м лівої і правої кнопок. DrakX автоматично знатиме, �кий\n"
-"інтерфей� викори�товує Ваша миша: PS/2, по�лідовний чи USB.\n"
+"інтерфей� викори�товує ваша миша: PS/2, по�лідовний чи USB.\n"
 "\n"
-"У випадку, �кщо Ви маєте мишу з трьома кнопками і без коліщатка,\n"
-"можете вибрати мишу \"%s\". DrakX тоді налаштує її так, щоб Ви могли\n"
+"У випадку, �кщо ви маєте мишу з трьома кнопками і без коліщатка,\n"
+"можете вибрати мишу «%s». DrakX тоді налаштує її так, щоб ви могли\n"
 "�имулювати його: дл� цього нати�ніть �ередню кнопку і переміщуйте\n"
 "мишу вперед-назад.\n"
 "\n"
-"Якщо з певних міркувань Ви хочете задати інший тип миші, виберіть його\n"
+"Якщо з певних міркувань ви хочете задати інший тип миші, виберіть його\n"
 "із �пи�ку, �кий пропонуєть��.\n"
 "\n"
-"Ви можете вибрати пункт \"%s\", щоб в�тановити \"загальний\" тип,\n"
+"ви можете вибрати пункт «%s», щоб в�тановити \"загальний\" тип,\n"
 "�кий працює майже з у�іма типами мишок.\n"
 "\n"
-"Якщо Ви вибрали мишу, відмінну від запропонованої, буде показано\n"
+"Якщо ви вибрали мишу, відмінну від запропонованої, буде показано\n"
 "те�тове вікно. Перевірте кнопки і коліщатко, щоб переконати��, що\n"
 "миша працює добре. Якщо миша працює неправильно, нати�ніть\n"
 "пробіл або [Return], щоб припинити те�т і повернути�� в �пи�ок вибору.\n"
@@ -1542,7 +1546,7 @@ msgstr ""
 "Миші з коліщатком деколи не визначають�� автоматично, тому Вам\n"
 "буде потрібно вибрати мишу із �пи�ку. Переконайте��, що Ви\n"
 "вибираєте мишу відповідно до порта, до �кого вона під'єднана. Пі�л�\n"
-"того, �к Ви виберете мишу і нати�нете на кнопку \"%s\", на екрані\n"
+"того, �к ви виберете мишу і нати�нете на кнопку «%s», на екрані\n"
 "по�вить�� зображенн� миші. Покрутіть коліщатко миші, щоб\n"
 "переконати��, що воно активізоване правильно. Пі�л� того, �к Ви\n"
 "побачите, що коліщатко на екрані рухаєть�� відповідно до коліщатка\n"
@@ -1566,7 +1570,7 @@ msgid ""
 "Windows is named \"ttyS0\" under GNU/Linux."
 msgstr ""
 "Будь ла�ка, виберіть вірний порт. �априклад, порт  COM1 у MS\n"
-"Windows має назву ttyS0 у GNU/Лінак�і."
+"Windows має назву ttyS0 у GNU/Linux."
 
 #: ../help.pm:684
 #, c-format
@@ -1582,7 +1586,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1595,19 +1599,19 @@ msgstr ""
 "і відповідно до знайденого на ньому виконає таке:\n"
 "\n"
 " * �кщо знайдено �ектор завантаженн� Windows, він замінить його на\n"
-"�ектор завантаженн� GRUB/LILO. В такий �по�іб Ви зможете\n"
+"�ектор завантаженн� GRUB/LILO. В такий �по�іб ви зможете\n"
 "завантажувати �к GNU/Linux, так і іншу ОС.\n"
 "\n"
 " * �кщо знайдено �ектор завантаженн� GRUB або LILO, його буде\n"
 "замінено на новий.\n"
 "\n"
 "Якщо неможливо визначити, DrakX запитає Ва�, куди в�тановити\n"
-"завантажувач. В загальному випадку \"%s\" є найкращим мі�цем.\n"
-"Вибравши \"%s\", Ви не в�тановите завантажувач. Викори�товуйте\n"
+"завантажувач. В загальному випадку «%s» є найкращим мі�цем.\n"
+"Вибравши «%s», ви не в�тановите завантажувач. Викори�товуйте\n"
 "це тільки тоді, коли розумієте, що робите."
 
 #: ../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"
@@ -1635,30 +1639,30 @@ msgid ""
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Зараз на�тав ча� вибрати �и�тему друку на Вашому комп'ютері. Інші\n"
-"ОС мають одну �и�тему друку, але Мандріва лінак� пропонує дві.\n"
+"ОС мають одну �и�тему друку, але Mageia пропонує дві.\n"
 "Кожна �и�тема друку найкраще підходить до різних типів конфігурації.\n"
 "\n"
-" * \"%s\" -- �кий є акронімом дл� \"друкувати, не �тавити в чергу\", є\n"
-"вибором, коли Ви маєте безпо�ередньо під'єднану друкарку і не\n"
+" * «%s» — �кий є акронімом дл� \"друкувати, не �тавити в чергу\", є\n"
+"вибором, коли ви маєте безпо�ередньо під'єднану друкарку і не\n"
 "хочете мати проблем із зминанн�м паперу, і не маєте мережевих\n"
-"друкарок. (\"%s\" керуватиме тільки дуже про�тими випадками з\n"
+"друкарок. («%s» керуватиме тільки дуже про�тими випадками з\n"
 "мережею і є в де�кій мірі повільнішим, ніж викори�танн� з мережами).\n"
-"Рекомендуєть�� викори�товувати \"pdq\", �кщо це Ваш перший до�від\n"
+"Рекомендуєть�� викори�товувати \"pdq\", �кщо це ваш перший до�від\n"
 "викори�танн� GNU/Linux.\n"
 "\n"
-" * \"%s\" - \"Загальна �и�тема друку дл� Лінак�\", є відміннім вибором\n"
+" * «%s» - \"Загальна �и�тема друку дл� Linux\", є відміннім вибором\n"
 "дл� друку на мі�цеву друкарку або на іншу в будь-�кій точці планети.\n"
 "Вона про�та дл� налаштуванн� і може працювати �к клієнт або �ервер\n"
 "дл� �тарих �и�тем друку \"lpd \", тобто є �умі�ною з попередніми\n"
 "операційними �и�темами, �кі можуть в�е ще вимагати �ерві�ів друку.\n"
 "Хоч вона і є дуже потужною, загальне в�тановленн� є майже таким\n"
-"�амим про�тим, �к і \"pdq\". Якщо Вам потрібно емулювати �ервер \"lpd\",\n"
-"переконайте��, що увімкнена �лужба \"cups-lpd \". \"%s\" має графічну\n"
-"оболонку дл� друку або вибору параметрів друкарки і управлінн� нею.\n"
+"�амим про�тим, �к і \"pdq\". Якщо вам потрібно емулювати �ервер \"lpd\",\n"
+"переконайте��, що увімкнена �лужба \"cups-lpd \". «%s» має графічну\n"
+"оболонку дл� друку або вибору параметрів принтера і управлінн� ним.\n"
 " \n"
-"Якщо Ви зараз зробите вибір, а пізніше побачите, що ц� �и�тема друку\n"
-"Вам не подобаєть��, Ви можете її замінити з допомогою PrinterDrake з\n"
-"Центру керуванн� Мандріва , нати�нувши кнопку \"%s\"."
+"Якщо ви зараз зробите вибір, а пізніше побачите, що ц� �и�тема друку\n"
+"вам не подобаєть��, ви можете її замінити з допомогою PrinterDrake з\n"
+"Центру керуванн� Mageia, нати�нувши кнопку «%s»."
 
 #: ../help.pm:768
 #, c-format
@@ -1668,7 +1672,7 @@ msgstr "pdq"
 #: ../help.pm:724
 #, c-format
 msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
 
 #: ../help.pm:724
 #, c-format
@@ -1683,7 +1687,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1701,16 +1705,16 @@ msgstr ""
 "драйвер.\n"
 "\n"
 "Через те, що визначенн� заліза не є про�тим, DrakX може завершити\n"
-"визначенн� твердих ди�ків невдало. Якщо таке трапить��, Вам потрібно\n"
+"визначенн� твердих ди�ків невдало. Якщо таке трапить��, вам потрібно\n"
 "буде вве�ти тип обладнанн� вручну.\n"
 "\n"
-"Якщо Вам потрібно буде вручну вибирати драйвер, DrakX запитає,\n"
-"чи хочете Ви налаштувати його параметри. Краще, �кщо Ви вкажете\n"
+"Якщо вам потрібно буде вручну вибирати драйвер, DrakX запитає,\n"
+"чи хочете ви налаштувати його параметри. Краще, �кщо ви вкажете\n"
 "DrakX випробувати плату з о�обливими дл� неї параметрами, потрібними\n"
 "дл� ініціалізації адаптера. У більшо�ті випадків це працює нормально.\n"
 "\n"
 "Якщо DrakX не зможе в�тановити тип параметрів, необхідних дл�\n"
-"передачі обладнанню, Вам потрібно буде налаштувати драйвер вручну."
+"передачі обладнанню, вам потрібно буде налаштувати драйвер вручну."
 
 #: ../help.pm:789
 #, c-format
@@ -1719,12 +1723,12 @@ msgid ""
 "here. If you notice the sound card is not the one actually present on your\n"
 "system, you can click on the button and choose a different driver."
 msgstr ""
-"\"%s\": �кщо �и�тема визначить звукову карту, її тип буде показано тут.\n"
-"Якщо Ви побачите, що вона не того типу, що дій�но в�тавлена у Вашій\n"
+"«%s»: �кщо �и�тема визначить звукову карту, її тип буде показано тут.\n"
+"Якщо ви побачите, що вона не того типу, що дій�но в�тавлена у Вашій\n"
 "�и�темі, можете нати�нути кнопку і вибрати інший драйвер."
 
 #: ../help.pm:794
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "As a review, DrakX will present a summary of information it has gathered\n"
 "about your system. Depending on the hardware installed on your machine, you\n"
@@ -1791,76 +1795,73 @@ msgstr ""
 "про Вашу �и�тему. В залежно�ті від в�тановленого заліза, у Ва�\n"
 "повинні бути або в�і, або де�кі пункти. Кожен пункт може бути\n"
 "налаштований, що завершуєть�� коротким під�умком про поточну\n"
-"конфігурацію. �ати�ніть на відповідну \"%s\" кнопку, щоб змінити.\n"
+"конфігурацію. �ати�ніть на відповідну «%s» кнопку, щоб змінити.\n"
 "\n"
-" * \"%s\": перевірити поточну мапу клавіатури і змінити, �кщо потрібно.\n"
+" * «%s»: перевірити поточну мапу клавіатури і змінити, �кщо потрібно.\n"
 "\n"
-" * \"%s\": перевірити вибір країни. Якщо Ви знаходите�ь не в цій\n"
-"країні, нати�ніть кнопку \"%s\" і виберіть іншу. Якщо Вашої країни\n"
-"немає в показаному початковому �пи�ку, нати�ніть кнопку \"%s\",\n"
+" * «%s»: перевірити вибір країни. Якщо ви знаходите�ь не в цій\n"
+"країні, нати�ніть кнопку «%s» і виберіть іншу. Якщо вашої країни\n"
+"немає в показаному початковому �пи�ку, нати�ніть кнопку «%s»,\n"
 "щоб отримати повний �пи�ок країн.\n"
 "\n"
-" * \"%s\": типово DrakX визначає ча�овий по�� на о�нові країни, �ку\n"
-"Ви вибрали. Ви можете нати�нути кнопку \"%s\", �кщо його визначено\n"
+" * «%s»: типово DrakX визначає ча�овий по�� на о�нові країни, �ку\n"
+"ви вибрали. ви можете нати�нути кнопку «%s», �кщо його визначено\n"
 "неправильно.\n"
 "\n"
-" * \"%s\": перевірте налаштуванн� миші і нати�ніть на кнопку, щоб\n"
+" * «%s»: перевірте налаштуванн� миші і нати�ніть на кнопку, щоб\n"
 "змінити, �кщо необхідно.\n"
 "\n"
-" * \"%s\": нати�нувши на кнопку \"%s\", Ви викличите Помічника\n"
-"налаштуванн� друкарки. Зверніть�� до відповідного розділу \"Starter\n"
-"Guide\" дл� детальнішої інформації про те, �к в�тановити нову\n"
-"друкарку. Інтерфей�, пред�тавлений там, є подібним до того, що\n"
-"викори�товуєть�� при в�тановленні.\n"
-"\n"
-" * \"%s\": �кщо у Вашій �и�темі знайдено звукову карту, її буде\n"
-"показано тут. Якщо Ви ви�вите, що показана звукова карта не є\n"
-"тою, що на�правді в�тановлена у �и�темі, можете нати�нути на\n"
+" * «%s»: �кщо у вашій �и�темі знайдено звукову карту, її буде\n"
+"показано тут. Якщо ви ви�вите, що показана звукова карта не є\n"
+"тією, що на�правді в�тановлена у �и�темі, можете нати�нути на\n"
 "кнопку і вибрати інший драйвер.\n"
 "\n"
-" * \"%s\": �кщо у Вашій �и�темі знайдено карту ТБ, її має бути показано\n"
-"тут. Якщо ж Ви маєте карту ТБ, але її не знайдено, нати�ніть \"%s\",\n"
+" * «%s»: �кщо у вашій �и�темі знайдено карту ТБ, її має бути показано\n"
+"тут. Якщо ж ви маєте карту ТБ, але її не знайдено, нати�ніть «%s»,\n"
 "щоб �пробувати налаштувати її вручну.\n"
 "\n"
-" * \"%s\": Ви можете нати�нути \"%s\", щоб змінити параметри, пов'�зані\n"
+" * «%s»: ви можете нати�нути «%s», щоб змінити параметри, пов'�зані\n"
 "з картою, �кщо бачите, що конфігурацію в�тановлено неправильно.\n"
 "\n"
-" * \"%s\": типово DrakX налаштовує графічний інтерфей� з роздільною\n"
+" * «%s»: типово DrakX налаштовує графічний інтерфей� з роздільною\n"
 "здатні�тю \"800x600\" або \"1024x768\". Якщо це Ва� не задовольн�є,\n"
-"нати�ніть \"%s\", щоб переналаштувати графічний інтерфей�.\n"
+"нати�ніть «%s», щоб переналаштувати графічний інтерфей�.\n"
 "\n"
-" * \"%s\": Якщо Ви хочете зараз налаштувати до�туп до Інтернету\n"
+" * «%s»: Якщо ви хочете зараз налаштувати до�туп до інтернету\n"
 "або мі�цевої мережі. Зверніть�� до друкованої документації, або\n"
-"Центру керуванн� Мандріва пі�л� завершенн� в�тановленн�,\n"
+"Центру керуванн� Mageia пі�л� завершенн� в�тановленн�,\n"
 "щоб отримати повну довідку.\n"
 "\n"
-" * \"%s\": тут можна налаштувати адре�и прок�і HTTP і FTP, �кщо\n"
-"Ваша машина знаходить�� за прок�і-�ервером.\n"
+" * «%s»: тут можна налаштувати адре�и прок�і HTTP і FTP, �кщо\n"
+"ваша машина знаходить�� за прок�і-�ервером.\n"
 "\n"
-" * \"%s\": цей пункт да�ть змогу перевизначити рівень безпеки, �кий\n"
+" * «%s»: цей пункт да�ть змогу перевизначити рівень безпеки, �кий\n"
 "в�тановлено попереднім кроком ().\n"
 "\n"
-" * \"%s\": �кщо Ви плануєте під'єднати Вашу машину до Інтернету,\n"
+" * «%s»: �кщо ви плануєте під'єднати ваш комп’ютер до інтернету,\n"
 "хорошою ідеєю є захи�ти�� від вторгненн� шл�хом в�тановленн�\n"
 "захи�ного шлюзу. Зверніть�� до відповідного розділу \"Starter Guide\"\n"
 "дл� детальнішої інформації про в�тановленн� захи�ного шлюзу.\n"
 "\n"
-" * \"%s\": �кщо Ви хочете змінити конфігурацію завантажувача,\n"
-"нати�ніть цю кнопку. Це зарезервовано дл� до�відчених кори�тувачів.\n"
+" * «%s»: �кщо ви хочете змінити конфігурацію завантажувача,\n"
+"нати�ніть цю кнопку. Ці налаштуванн� призначено дл� до�відчених\n"
+"кори�тувачів. Зверніть�� до паперової документації або вбудованої\n"
+"довідки щодо налаштувань завантажувача у Центрі керуванн�\n"
+"Mageia.\n\n"
 "\n"
-" * \"%s\": тут Ви можете підправити, �кі �лужби будуть виконувати��\n"
-"на Вашій машині. Якщо Ви плануєте викори�товувати цю машину в\n"
-"�ко�ті �ервера, хорошою ідеєю є перегл�нути ці налаштуванн�."
+" * «%s»: тут ви можете підправити, �кі �лужби будуть виконувати��\n"
+"у вашій �и�темі. Якщо ви плануєте викори�товувати цю машину �к\n"
+"�ервер, варто є перегл�нути ці налаштуванн�."
 
 #: ../help.pm:809
-#, fuzzy, c-format
+#, c-format
 msgid "TV card"
-msgstr "Карта ISDN"
+msgstr "ТБ-картка"
 
 #: ../help.pm:809
 #, c-format
 msgid "ISDN card"
-msgstr "Карта ISDN"
+msgstr "Картка ISDN"
 
 #: ../help.pm:858
 #, c-format
@@ -1868,34 +1869,36 @@ msgid "Graphical Interface"
 msgstr "Графічний інтерфей�"
 
 #: ../help.pm:861
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
-"Виберіть твердий ди�к, �кий Ви хочете відформатувати дл�\n"
-"�творенн� нового розділу Мандріва лінак�а. Будьте обережні,\n"
-"в�і дані, що знаход�ть�� в цьому розділі, будуть втрачені і їх\n"
+"Виберіть твердий ди�к, �кий ви хочете відформатувати дл�\n"
+"�творенн� нового розділу Mageia. Будьте обережні:\n"
+"в�і дані, що знаход�ть�� в цьому розділі, буде втрачено, їх\n"
 "неможливо буде відновити!"
 
 #: ../help.pm:866
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
-"�ати�ніть \"%s\", �кщо Ви хочете �терти в�і дані і розділи на цьому\n"
-"твердому ди�ку. Будьте уважні, пі�л� нати�ненн� на \"%s\" Ви\n"
+"�ати�ніть «%s», �кщо ви хочете �терти в�і дані і розділи на цьому\n"
+"твердому ди�ку. Будьте уважні, пі�л� нати�ненн� на «%s» Ви\n"
 "не зможете відновити жодних даних і розділів на цьому твердому\n"
 "ди�ку, включаючи також будь-�кі дані Віндов�.\n"
 "\n"
-"�ати�ніть \"%s\", щоб зупинити цю операцію без втрати даних і\n"
+"�ати�ніть «%s», щоб зупинити цю операцію без втрати даних і\n"
 "розділів, �кі знаход�ть�� на цьому твердому ди�ку."
 
 #: ../help.pm:872
@@ -1906,7 +1909,7 @@ msgstr "Далі ->"
 #: ../help.pm:872
 #, c-format
 msgid "<- Previous"
-msgstr "<- Попередній"
+msgstr "<- �азад"
 
 #~ msgid ""
 #~ "\"%s\": clicking on the \"%s\" button will open the printer "
diff --git a/perl-install/install/help/po/uz.po b/perl-install/install/help/po/uz.po
index a4fe9e074..2169106cb 100644
--- a/perl-install/install/help/po/uz.po
+++ b/perl-install/install/help/po/uz.po
@@ -88,7 +88,7 @@ msgstr "Bu qulaylikdan foydalanishni istaysizmi?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -98,24 +98,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -428,31 +428,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -468,14 +468,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -632,19 +632,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -660,21 +660,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -691,14 +691,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -739,34 +733,34 @@ msgstr "Odiy/ekspert usuliga o'tish"
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -791,8 +785,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -949,7 +943,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1008,7 +1002,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1115,7 +1109,7 @@ msgstr "Grafik interfeys"
 #: ../help.pm:861
 #, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1124,12 +1118,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Bu diskdagi barcha ma'lumotni va diskning barcha qismlarini\n"
 "o'chirish uchun \"%s\"ni bosing. Ehtiyot bo'ling, \"%s\"ni bosganingizdan\n"
diff --git a/perl-install/install/help/po/uz@cyrillic.po b/perl-install/install/help/po/uz@cyrillic.po
index 6ddfdd00d..c318abb18 100644
--- a/perl-install/install/help/po/uz@cyrillic.po
+++ b/perl-install/install/help/po/uz@cyrillic.po
@@ -88,7 +88,7 @@ msgstr "Бу қулайликдан фойдаланишни иÑ�тайÑ�измÐ
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -98,24 +98,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
@@ -427,31 +427,31 @@ msgstr ""
 #, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -467,14 +467,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -631,19 +631,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -659,21 +659,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -690,14 +690,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 
 #: ../help.pm:526
@@ -738,34 +732,34 @@ msgstr "Одий/�к�перт у�улига ўтиш"
 #: ../help.pm:536
 #, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 
@@ -790,8 +784,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -948,7 +942,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1007,7 +1001,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1114,7 +1108,7 @@ msgstr "График интерфей�"
 #: ../help.pm:861
 #, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1123,12 +1117,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Бу ди�кдаги барча маълумотни ва ди�книнг барча қи�мларини\n"
 "ўчириш учун \"%s\"ни бо�инг. Эҳтиёт бўлинг, \"%s\"ни бо�ганингиздан\n"
diff --git a/perl-install/install/help/po/vi.po b/perl-install/install/help/po/vi.po
index faa0e6e7d..887d001df 100644
--- a/perl-install/install/help/po/vi.po
+++ b/perl-install/install/help/po/vi.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2005-06-02 21:17+0700\n"
 "Last-Translator: Larry Nguyen <larry@vnlinux.org>\n"
 "Language-Team:  <gnomevi-list@lists.sourceforge.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -121,7 +122,8 @@ msgstr "Bạn muốn dùng tính năng này không?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -131,24 +133,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Trên đây là danh sách các phân vùng Linux hiện có trên đĩa cứng của bạn.\n"
@@ -259,8 +265,7 @@ msgstr ""
 "nhóm các ứng dụng giống nhau để dễ dàng quản lý.\n"
 "\n"
 "Các gói phần m�m được xếp loại theo các nhóm tương ứng với việc sử dụng\n"
-"cụ thể cho máy tính. Mageia có 4 kiểu cài đặt sẵn với nhi�u loại gói "
-"tin.\n"
+"cụ thể cho máy tính. Mageia có 4 kiểu cài đặt sẵn với nhi�u loại gói tin.\n"
 "Bạn có thể ch�n dùng các ứng dụng pha trộn của các kiểu cài đặt này, ví dụ\n"
 "như cài đặt kiểu ``Máy trạm'' cùng với việc cài các ứng dụng của kiểu cài\n"
 "đặt ``Máy chủ''.\n"
@@ -675,31 +680,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -715,14 +724,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1009,19 +1019,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1037,21 +1050,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1068,14 +1083,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Vào lúc này, bạn cần ch�n những phân vùng nào sẽ được dùng để cài đặt\n"
 "hệ thống Mageia. Nếu các phân vùng đã được xác lập từ lần cài\n"
@@ -1092,7 +1101,7 @@ msgstr ""
 "\n"
 " * \"%s\": để xóa m�i phân vùng có trên đĩa cứng được ch�n.\n"
 "\n"
-" * \"%s\": cho phép tự động tạo các phân vùng ext3 và swap\n"
+" * \"%s\": cho phép tự động tạo các phân vùng ext4 và swap\n"
 "tại không gian trống của đĩa cứng.\n"
 "\n"
 " * \"%s\" : cho phép thực hiện thêm một số tính năng:\n"
@@ -1140,13 +1149,6 @@ msgstr ""
 "\n"
 "�ể có thêm thông tin v� các loại hệ thống tập tin hiện có, hãy đ�c chương\n"
 "ext2FS ở trong ``Tài liệu Tham khảo''.\n"
-"\n"
-"Nếu đang thực hiện cài đặt trên máy PPC, có thể bạn muốn tạo một phân vùng\n"
-"``bootstrap'' HFS có kích thước ít nhất 1MB để cho trình nạp khởi động\n"
-"yaboot. Nếu lập kích thước phân vùng này lớn hơn một chút (50MB), bạn sẽ "
-"thấy\n"
-"đó là nơi hữu ích để lưu trữ kernel dự phòng và các ảnh ramdisk cho các\n"
-"trư�ng hợp khởi động khẩn cấp."
 
 #: ../help.pm:526
 #, c-format
@@ -1186,34 +1188,40 @@ msgstr "Chuyển đổi giữa chế độ bình thư�ng và chuyên gia"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Phát hiện ra có hơn một phân vùng Microsoft Windows trên đĩa cứng.\n"
@@ -1271,8 +1279,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1519,7 +1528,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1616,7 +1625,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1801,7 +1810,7 @@ msgstr "Giao Diện �ồ H�a"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1813,12 +1822,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Nhấn chuột lên \"%s\" nếu muốn xóa m�i dữ liệu và phân vùng hiện có\n"
 "trên đĩa cứng này. Hãy thận tr�ng, sau khi nhấn \"%s\", bạn sẽ không\n"
diff --git a/perl-install/install/help/po/wa.po b/perl-install/install/help/po/wa.po
index 144649301..5a1ff1248 100644
--- a/perl-install/install/help/po/wa.po
+++ b/perl-install/install/help/po/wa.po
@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2005-02-24 21:42+0100\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,8 @@ msgstr "Voloz vs eployî cisse fonccionålité chal?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -143,24 +145,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Chal pa dzeur i gn a ene djivêye des pårticions Linux k' i gn a so vosse\n"
@@ -170,7 +176,8 @@ msgstr ""
 "Ni prindoz nén ene trop ptite grandeu ôtrumint vos n' pôrîz astaler "
 "Ã¥jheymint\n"
 "des programes, fåte di plaece. Si vos vloz mete vos dnêyes so ene pårticion\n"
-"diferinne, vos dvroz ossu fé ene po «/home» (çou ki vos pôroz fé seulmint si\n"
+"diferinne, vos dvroz ossu fé ene po «/home» (çou ki vos pôroz fé seulmint "
+"si\n"
 "vos avoz pus d' ene pårticion del sôre Linux).\n"
 "\n"
 "Po l' informåcion, tchaeke pårticion est mostrêye come çoula: «no», "
@@ -294,8 +301,8 @@ msgstr ""
 "ostant ki possibe, les specifiaedjes del «Linux Standard Base».\n"
 "\n"
 "   Tchoezi l' groupe «LSB» astalrè eto les naweas del séreye «2.4»,\n"
-"el plaece do prémetou nawea «2.6». Çoula c' est po-z esse 100%% copatibe avou "
-"LSB. Mins nerén, si vos n' tchoezixhoz nén li groupe «LSB»\n"
+"el plaece do prémetou nawea «2.6». Çoula c' est po-z esse 100%% copatibe "
+"avou LSB. Mins nerén, si vos n' tchoezixhoz nén li groupe «LSB»\n"
 "vos ploz tot l' minme aveur on sistinme k' est copatibe LSB cåzu a 100%%.\n"
 "\n"
 " * «%s»: al fén, si l' såme di l' éndjole c' est d' esse on sierveu,\n"
@@ -714,31 +721,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -754,14 +765,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -1071,19 +1083,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -1099,21 +1114,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1130,14 +1147,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "Chal, vos dvoz tchoezi so kéne/kénès pårticion(s) ki vos voloz astaler\n"
 "vosse sistinme Mageia. Si vos pårticions ont ddja stî fwaites\n"
@@ -1157,8 +1168,8 @@ msgstr ""
 "   * «%s»: cisse tchuze va disfacer totes les pårticions k' i gn a sol "
 "tchoezeye deure plake.\n"
 "\n"
-"   * «%s»: cisse tchuze va fé des pårticions ext3 pol sistinme et ene di swap "
-"e prindant li plaece di libe k' i gn a sol deure plake et carculant "
+"   * «%s»: cisse tchuze va fé des pårticions ext4 pol sistinme et ene di "
+"swap e prindant li plaece di libe k' i gn a sol deure plake et carculant "
 "otomaticmint li grandeu li meyeuse.\n"
 "\n"
 "«%s» dene des ôtes tchuzes, pus spepieuses:\n"
@@ -1212,12 +1223,6 @@ msgstr ""
 "\n"
 "Po-z aveur des informåcions so les diferins sistinmes di fitchîs k' i gn a,\n"
 "lijhoz li tchaptrê so «ext2FS» do «Manuel di Referince».\n"
-"\n"
-"Si vos alez astaler sor ene éndjole PPC, motoit ki vos vôroz fé ene pitite "
-"pårticion HFS «d' enondaedje» di 1 Mo å moens po l' eployî avou l' enondrece "
-"«yaboot». Si vos decidez del fé on pô pus grande, par egzimpe 50 Mo, çoula "
-"pôreut fé ene clapante plaece po-z î mete on nawea et ene imådje ramdisk po "
-"des cas d' urdjince k' i gn åreut."
 
 #: ../help.pm:526
 #, c-format
@@ -1257,34 +1262,40 @@ msgstr "Candjî pol môde normå/spepieus"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "Pus d' ene pårticion Windows a stî detectêye so vosse deure plake.\n"
@@ -1295,8 +1306,8 @@ msgstr ""
 "«no Linux», «no Windows», «grandeu».\n"
 "\n"
 "Li «no Linux» est costrût come çouchal:\n"
-"«sôre del deure plake» + «limero del deure plake» + «limero del pårticion» (par "
-"egzimpe, hd+a+1 --> «hda1»)\n"
+"«sôre del deure plake» + «limero del deure plake» + «limero del "
+"pårticion» (par egzimpe, hd+a+1 --> «hda1»)\n"
 "\n"
 "Li «sôre del deure plake» est «hd» si vosse deure plake est del sôre IDE,\n"
 "oudonbén «sd» si elle est del sôre SCSI.\n"
@@ -1344,8 +1355,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1624,7 +1636,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1704,8 +1716,7 @@ msgstr ""
 "\n"
 "Si vos tchoezixhoz asteure, et ki pus tård vos n' inmez nén vosse sistinme\n"
 "d' imprimaedje, vos l' poloz åjheymint candjî avou l' usteye d' apontiaedje\n"
-"des scrireces, a-z enonder a pårti do cinte di contrôle di Mageia, "
-"tot\n"
+"des scrireces, a-z enonder a pårti do cinte di contrôle di Mageia, tot\n"
 "clitchant sol boton «%s»."
 
 #: ../help.pm:768
@@ -1731,7 +1742,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1920,7 +1931,7 @@ msgstr "Eterface grafike"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1932,12 +1943,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "Clitchîz so «%s» si vos vloz disfacer totes les dnêyes et totes les\n"
 "pårticions k' i gn a so vosse deure plake.\n"
@@ -2029,8 +2042,10 @@ msgstr "<- Di dvant"
 #~ "GNU/Linux: vos dvoz dner li scret po «root». «root» est li manaedjeu\n"
 #~ "do sistinme eyet l' seu otorijhî a fé des metaedjes a djoû, radjouter\n"
 #~ "des uzeus, candjî l' apontiaedje djenerå do sistinme, evnd. Po fé court,\n"
-#~ "«root» pout fé ttafwait! C' est po çoula k' i vs fåt bén tchoezi li scret\n"
-#~ "di «root», onk ki soeye målåjhey a trover - DrakX vos dirè s' il est trop\n"
+#~ "«root» pout fé ttafwait! C' est po çoula k' i vs fåt bén tchoezi li "
+#~ "scret\n"
+#~ "di «root», onk ki soeye målåjhey a trover - DrakX vos dirè s' il est "
+#~ "trop\n"
 #~ "åjhey. Come vos l' poloz vey, vos avoz l' tchuze di n' nén dner di "
 #~ "scret,\n"
 #~ "mins nos nel consians nén; «root» pout tot fé, çoula vout dire eto k' i "
@@ -2058,7 +2073,8 @@ msgstr "<- Di dvant"
 #~ "\n"
 #~ "Si vosse rantoele eploye li protocole LDAP, NIS ou les dominnes Windows "
 #~ "PDC\n"
-#~ "po l' otintifiaedje, tchoezixhoz li moyén d' otintifiaedje corek po «%s».\n"
+#~ "po l' otintifiaedje, tchoezixhoz li moyén d' otintifiaedje corek po "
+#~ "«%s».\n"
 #~ "Si vos n' savoz nén, dimandez a l' administreu del rantoele locåle.\n"
 #~ "\n"
 #~ "Si vos avoz des rujhes po vs rimimbrer les screts, vos ploz tchoezi di\n"
diff --git a/perl-install/install/help/po/zh_CN.po b/perl-install/install/help/po/zh_CN.po
index b70524fbc..0e309574e 100644
--- a/perl-install/install/help/po/zh_CN.po
+++ b/perl-install/install/help/po/zh_CN.po
@@ -116,7 +116,7 @@ msgstr "您�使用此特性�?"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -126,24 +126,24 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "在此列出了您硬盘上已有的 Linux\n"
@@ -640,31 +640,31 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -680,14 +680,14 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -961,19 +961,19 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -989,21 +989,21 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -1020,14 +1020,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "在这一步中, 您需�选择�使用哪个或哪些分区�安装您的 Mageia 系统。如"
 "果已�定义了分区, �管是先�安装的 GNU/Linux\n"
@@ -1042,7 +1036,7 @@ msgstr ""
 "\n"
 " * \"%s\": 此选项将删除选中硬盘上的全部分区\n"
 "\n"
-" * \"%s\": 此选项�在您硬盘的剩余空间中为您自动创建 ext3 和交�分区\n"
+" * \"%s\": 此选项�在您硬盘的剩余空间中为您自动创建 ext4 和交�分区\n"
 "\n"
 "\"%s\": 使您�以访问�外特性: \n"
 "\n"
@@ -1082,11 +1076,6 @@ msgstr ""
 " * Ctrl+M 设定挂载点\n"
 "\n"
 "�的关于��的文件系统类型的更多信�, 请查看“�考手册�中 ext2FS 一章。\n"
-"\n"
-"如果您在 PPC 计算机上安装, 您�能需�创建至少 1MB 大�的 HFS“bootstrap�分区, "
-"该分区将用于 yaboot\n"
-"引导程�。如果您创建的分区��微大点, 比如说 50MB, 您�能会�现这个分区�用�"
-"存储内核或紧急引导时的虚拟�盘映�。"
 
 #: ../help.pm:526
 #, c-format
@@ -1126,34 +1115,34 @@ msgstr "在正常/专家模�间切�"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "在硬盘上检测到了多个 Microsoft 分区。请选择一个分区改�大�, 以便安装您新\n"
@@ -1207,8 +1196,8 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1458,7 +1447,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1553,7 +1542,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1727,7 +1716,7 @@ msgstr "图形界�"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1738,12 +1727,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
+"to recover any data and partitions present on this hard disk drive, including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "如果您想�删除此硬盘上的所有数�和分区, 请�击“%s�。注�, �击“%s��, \n"
 "您将无法��此硬盘上的任何数�或分区(包括任何 Windows 数�)。\n"
diff --git a/perl-install/install/help/po/zh_TW.po b/perl-install/install/help/po/zh_TW.po
index 189c95df7..f95db7e15 100644
--- a/perl-install/install/help/po/zh_TW.po
+++ b/perl-install/install/help/po/zh_TW.po
@@ -23,6 +23,7 @@ msgstr ""
 "PO-Revision-Date: 2006-04-06 20:30+0200\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Traditional Chinese <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,7 +130,8 @@ msgstr "您想�使用這個功能嗎？"
 #: ../help.pm:57
 #, c-format
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard drive.\n"
+"Listed here are the existing Linux partitions detected on your hard disk "
+"drive.\n"
 "You can keep the choices made by the wizard, since they are good for most\n"
 "common installations. If you make any changes, you must at least define a\n"
 "root partition (\"/\"). Do not choose too small a partition or you will not\n"
@@ -139,24 +141,28 @@ msgid ""
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number"
+"\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard "
+"disk drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "目�所列出來的是硬碟機上�測到已經存在的 Linux 分割�.\n"
@@ -555,31 +561,35 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "You now need to decide where you want to install the Mageia\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
+"operating system on your hard disk drive. If your hard disk drive is empty "
+"or if an\n"
 "existing operating system is using all the available space you will have to\n"
-"partition the drive. Basically, partitioning a hard drive means to\n"
+"partition the drive. Basically, partitioning a hard disk drive means to\n"
 "logically divide it to create the space needed to install your new\n"
 "Mageia system.\n"
 "\n"
-"Because the process of partitioning a hard drive is usually irreversible\n"
+"Because the process of partitioning a hard disk drive is usually "
+"irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
 "for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on the configuration of your hard drive, several options are\n"
+"Depending on the configuration of your hard disk drive, several options are\n"
 "available:\n"
 "\n"
 " * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
 " * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
-"your hard drive. If you want to use them, choose this option. You will then\n"
+"your hard disk drive. If you want to use them, choose this option. You will "
+"then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard disk drive and "
+"takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
@@ -595,14 +605,15 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mageia system, choose\n"
+"your hard disk drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+" * \"%s\". This option appears when the hard disk drive is entirely taken "
+"by\n"
 "Microsoft Windows. Choosing this option will simply erase everything on the\n"
 "drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
@@ -854,8 +865,8 @@ msgstr ""
 "安全性等級應該設定較高. 權衡之下, 較高的安全性等級�得�容易使用.\n"
 "\n"
 "如果您�知��什麼, �留�設�項. 您將能在�後用 draksec 工具改變它,\n"
-"draksec 是 Mageia 控制中心的一部分.用負責安全性的人的 e-mail 地�填"
-"入 \"%s\" 欄�. 安全性訊�將被寄到\n"
+"draksec 是 Mageia 控制中心的一部分.用負責安全性的人的 e-mail 地�填入 \"%s\" "
+"欄�. 安全性訊�將被寄到\n"
 "那個��."
 
 #: ../help.pm:461
@@ -869,19 +880,22 @@ 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"
 "defined, either from a previous installation of GNU/Linux or by another\n"
-"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
+"partitioning tool, you can use existing partitions. Otherwise, hard disk "
+"drive\n"
 "partitions must be defined.\n"
 "\n"
-"To create partitions, you must first select a hard drive. You can select\n"
+"To create partitions, you must first select a hard disk drive. You can "
+"select\n"
 "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n"
 "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
 "\n"
-"To partition the selected hard drive, you can use these options:\n"
+"To partition the selected hard disk drive, you can use these options:\n"
 "\n"
-" * \"%s\": this option deletes all partitions on the selected hard drive\n"
+" * \"%s\": this option deletes all partitions on the selected hard disk "
+"drive\n"
 "\n"
-" * \"%s\": this option enables you to automatically create ext3 and swap\n"
-"partitions in the free space of your hard drive\n"
+" * \"%s\": this option enables you to automatically create ext4 and swap\n"
+"partitions in the free space of your hard disk drive\n"
 "\n"
 "\"%s\": gives access to additional features:\n"
 "\n"
@@ -897,21 +911,23 @@ msgid ""
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
-"originally on the hard drive.\n"
+"originally on the hard disk drive.\n"
 "\n"
 " * \"%s\": un-checking this option will force users to manually mount and\n"
 "unmount removable media such as floppies and CD-ROMs.\n"
 "\n"
 " * \"%s\": use this option if you wish to use a wizard to partition your\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": use this option to cancel your changes.\n"
 "\n"
 " * \"%s\": allows additional actions on partitions (type, options, format)\n"
-"and gives more information about the hard drive.\n"
+"and gives more information about the hard disk drive.\n"
 "\n"
-" * \"%s\": when you are finished partitioning your hard drive, this will\n"
+" * \"%s\": when you are finished partitioning your hard disk drive, this "
+"will\n"
 "save your changes back to disk.\n"
 "\n"
 "When defining the size of a partition, you can finely set the partition\n"
@@ -928,14 +944,8 @@ msgid ""
 "\n"
 " * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different file system types available, please\n"
+"To get information about the different filesystem types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
-"\n"
-"If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
-"bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
-"may find it a useful place to store a spare kernel and ramdisk images for\n"
-"emergency boot situations."
 msgstr ""
 "在這個階段, 您需��擇�用來安� Mageia 系統的分割�.\n"
 "如果分割�已經被定義了, �管是從舊有的 GNU/Linux 安�或是\n"
@@ -949,7 +959,7 @@ msgstr ""
 "\n"
 " * \"%s\": 這個�項刪除在所�的影碟上的全部分割�\n"
 "\n"
-" * \"%s\": 這個�項使您自動建立 ext3 與 swap 分割�於您的硬碟上的空白空間\n"
+" * \"%s\": 這個�項使您自動建立 ext4 與 swap 分割�於您的硬碟上的空白空間\n"
 "\n"
 "\"%s\": 給多加的功能的使用:\n"
 "\n"
@@ -967,7 +977,8 @@ msgstr ""
 "\n"
 " * \"%s\": 如果您想用精�來分割您的硬碟, 使用這個�項. 如果您沒有�於\n"
 "�作分割的好的了解, 這是被建議的.\n"
-"hard drive. This is recommended if you do not have a good understanding of\n"
+"hard disk drive. This is recommended if you do not have a good understanding "
+"of\n"
 "partitioning.\n"
 "\n"
 " * \"%s\": 用這個�項來�消您的變更.\n"
@@ -990,12 +1001,6 @@ msgstr ""
 "\n"
 "�得到關於���用的檔案系統的資訊, 請從 ``Reference Manual (�考手冊)''\n"
 "閱讀 ext2FS 章節.\n"
-"\n"
-"如果您正在安�於一個 PPC 機器, 您將想�建立一個�的 HFS\n"
-"``bootstrap'' 分割至少 1MB 以用於 yaboot 開機載入器. 如果您�擇使分割大一"
-"些,\n"
-"� 50MB, 您或許發�它是一個好用的貯存一個備用核心與 ramdisk\n"
-"影�給緊急使用開機的好地方."
 
 #: ../help.pm:526
 #, c-format
@@ -1035,34 +1040,40 @@ msgstr "切�一般/專家模�"
 #: ../help.pm:536
 #, fuzzy, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
+"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"
 "Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive "
+"number\",\n"
 "\"partition number\" (for example, \"hda1\").\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk "
+"drive and\n"
+"\"sd\" if it is a SCSI hard disk drive.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With "
+"IDE\n"
+"hard disk drives:\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+" * \"a\" means \"master hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+" * \"b\" means \"slave hard disk drive on the primary IDE controller\";\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * \"c\" means \"master hard disk drive on the secondary IDE controller\";\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" "
+"means\n"
 "\"second lowest SCSI ID\", etc.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"\"Windows name\" is the letter of your hard disk drive under Windows (the "
+"first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
 "多於一個 Microsoft 分割�已經在您的硬碟上被�測到. 請�擇您希望��新調整 大"
@@ -1116,8 +1127,9 @@ msgid ""
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
 "your existing data (notably \"home\" directories) from being over-written.\n"
-"If you wish to change how your hard drives are partitioned, or to change\n"
-"the file system, you should use this option.\n"
+"If you wish to change how your hard disk drives are partitioned, or to "
+"change\n"
+"the filesystem, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mageia system. Your current partitioning\n"
@@ -1231,8 +1243,7 @@ msgstr ""
 "�擇英文當�設語言且在進階部份�擇 \"%s\".\n"
 "\n"
 "關於 UTF-8 (unicode) 支�：Unicode 是一個新的字元編碼以涵蓋所有存在的語言。\n"
-"然而, 在 GNU/Linux 下完全的支��然在開發中. 因為那個原因, Mageia "
-"çš„\n"
+"然而, 在 GNU/Linux 下完全的支��然在開發中. 因為那個原因, Mageia 的\n"
 " UTF-8 使用將根據使用者的�擇而定：\n"
 "\n"
 " * 如果您�擇一個有��傳統編碼的語言 (latin1 語言�俄羅斯文�日文�中文�\n"
@@ -1357,7 +1368,7 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can not determine where to place the boot sector, it'll ask you\n"
+"If DrakX cannot determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
 "Choosing \"%s\" will not install any boot loader. Use this option only if "
 "you\n"
@@ -1404,8 +1415,7 @@ msgid ""
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "�在��擇您的電腦�使用的列�系統. 其他作業系統或許�有�供您一種�擇,\n"
-"但是 Mageia 這邊�供了兩種�擇. �一種列�系統是最��於特別設定型"
-"æ…‹.\n"
+"但是 Mageia 這邊�供了兩種�擇. �一種列�系統是最��於特別設定型態.\n"
 "\n"
 " * \"%s\" - 是 ``print, do not queue (列�, �排隊)'' 之縮寫字, 是當您有一"
 "個\n"
@@ -1447,7 +1457,7 @@ msgid ""
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
 "Because hardware detection is not foolproof, DrakX may fail in detecting\n"
-"your hard drives. If so, you'll have to specify your hardware by hand.\n"
+"your hard disk drives. If so, you'll have to specify your hardware by hand.\n"
 "\n"
 "If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
 "want to configure options for it. You should allow DrakX to probe the\n"
@@ -1565,7 +1575,7 @@ msgstr "圖形介�"
 #: ../help.pm:861
 #, fuzzy, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
+"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"
 "and will not be recoverable!"
 msgstr ""
@@ -1576,12 +1586,14 @@ msgstr ""
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
+"this hard disk drive. Be careful, after clicking on \"%s\", you will not be "
+"able\n"
+"to recover any data and partitions present on this hard disk drive, "
+"including\n"
 "any Windows data.\n"
 "\n"
 "Click on \"%s\" to quit this operation without losing data and partitions\n"
-"present on this hard drive."
+"present on this hard disk drive."
 msgstr ""
 "您如果想�刪除在這個硬碟上的全部資料與分割, 點� \"%s\".\n"
 "�心, 點� \"%s\" 之後, 您將無法挽回任何在這個硬碟上的資料與分割, 包�\n"
diff --git a/perl-install/install/http.pm b/perl-install/install/http.pm
index 2a625dff3..db111564c 100644
--- a/perl-install/install/http.pm
+++ b/perl-install/install/http.pm
@@ -1,13 +1,9 @@
-package install::http; # $Id: http.pm 270205 2010-07-02 12:24:09Z pterjan $
+package install::http;
 
 use urpm::download;
 use common;
 use Cwd;
 
-# to be killed once callers got fixed
-sub close() {
-}
-
 sub getFile {
     my ($url, %o_options) = @_;
     my ($_size, $fh) = get_file_and_size($url, %o_options) or return;
@@ -41,6 +37,7 @@ sub get_file_and_size {
     if (!$urpm) {
         require install::pkgs;
         $urpm = install::pkgs::empty_packages($::o->{keep_unrequested_dependencies});
+	$urpm->{options}{'curl-options'} = '-s';
     }
 
     my $cachedir = $urpm->{cachedir} || '/root';
@@ -55,12 +52,7 @@ sub get_file_and_size {
         urpm::download::set_cmdline_proxy(http_proxy => "http://$proxy/");
     }
     
-    (my $cwd) = getcwd() =~ /(.*)/;
     my $res = eval { urpm::download::sync_url($urpm, $url, %o_options, dir => $cachedir) };
-    #- urpmi does not always reset cwd when dying or failing!
-    #- do not stay in /mnt/var/cache/urpmi, it's evil to be in /mnt
-    #- FIXME: fix urpmi
-    chdir $cwd;
 
     if ($res) {
         open(my $f, $file);
diff --git a/perl-install/install/install2 b/perl-install/install/install2
index 5b205af0c..ba8b558a9 100755
--- a/perl-install/install/install2
+++ b/perl-install/install/install2
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 #- PERL_INSTALL_TEST is used to launch stage2 in debug mode
 
-#- Mandrake Graphic Install $Id: install2 258993 2009-08-07 18:01:22Z pterjan $
-#- Copyright (C) 1999/2000 Mandrakesoft (pixel@mandrakesoft.com)
+#- Mandrake Graphic Install
+#- Copyright (C) 1999/2000 Mandrakesoft (pixel)
 #-
 #- This program is free software; you can redistribute it and/or modify
 #- it under the terms of the GNU General Public License as published by
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 9b600a482..2e50db4d0 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -1,4 +1,4 @@
-package install::install2; # $Id: install2.pm 255825 2009-04-08 11:54:23Z tv $
+package install::install2;
 
 use diagnostics;
 use strict;
@@ -6,6 +6,12 @@ use vars qw($o);
 
 BEGIN { $::isInstall = 1 }
 
+=head1 SYNOPSYS
+
+The installer stage2 real entry point
+
+=cut
+
 #-######################################################################################
 #- misc imports
 #-######################################################################################
@@ -26,13 +32,30 @@ use any;
 use log;
 use fs;
 use fs::any;
-
+use fs::mount;
+use messages;
 
 #-#######################################################################################
-#-$O
-#-the big struct which contain, well everything (globals + the interactive methods ...)
-#-if you want to do a kickstart file, you just have to add all the required fields (see for example
-#-the variable $default)
+=head1 Data Structure
+
+=head2 $O;
+
+$o (or $::o in other modules) is the big struct which contain, well everything:
+
+=over 4
+
+=item * globals
+
+=item * the interactive methods
+
+=item * ...
+
+=back
+
+if you want to do a kickstart file, you just have to add all the required fields (see for example
+the variable $default)
+
+=cut
 #-#######################################################################################
 $o = $::o = {
 #    bootloader => { linear => 0, message => 1, timeout => 5, restricted => 0 },
@@ -65,7 +88,7 @@ $o = $::o = {
 	    #-   eth0 => { DEVICE => "eth0", IPADDR => '1.2.3.4', NETMASK => '255.255.255.128' }
 	    #- },
 	    },
-
+    untranslated_license => messages::main_license_raw(),
 #-step : the current one
 #-prefix
 #-mouse
@@ -76,21 +99,40 @@ $o = $::o = {
 
 };
 
+=head1 Steps Navigation
+
+=over
+
+=cut
 
 sub installStepsCall {
     my ($o, $auto, $fun, @args) = @_;
     $fun = "install::steps::$fun" if $auto;
     $o->$fun(@args);
 }
+
+=item getNextStep($o)
+
+Returns next step
+
+=cut
+
 sub getNextStep {
     my ($o) = @_;
     find { !$o->{steps}{$_}{done} && $o->{steps}{$_}{reachable} } @{$o->{orderedSteps}};
 }
 
 #-######################################################################################
-#- Steps Functions
-#- each step function are called with two arguments : clicked(because if you are a
-#- beginner you can force the the step) and the entered number
+
+=back
+
+=head1 Steps Functions
+
+Each step function are called with two arguments : clicked(because if you are a
+beginner you can force the the step) and the entered number
+
+=cut
+
 #-######################################################################################
 
 #------------------------------------------------------------------------------
@@ -176,7 +218,7 @@ sub formatPartitions {
 	eval { rm_rf("$::prefix/var/lib/rpm") };
     }
 
-    fs::any::prepare_minimal_root($o->{all_hds});
+    fs::any::prepare_minimal_root();
 
     install::any::screenshot_dir__and_move();
     install::any::move_compressed_image_to_disk($o);
@@ -199,7 +241,8 @@ sub choosePackages {
     log::l("rpmsrate_flags_chosen's: ", join(' ', sort @flags));
 
     #- check pre-condition that basesystem package must be selected.
-    install::pkgs::packageByName($o->{packages}, 'basesystem')->flag_available or die "basesystem package not selected";
+    my $base_pkg = install::pkgs::packageByName($o->{packages}, 'basesystem');
+    $base_pkg->flag_available or $base_pkg->flag_installed or die "basesystem package not selected";
 
     #- check if there are packages that need installation.
     $o->{steps}{installPackages}{done} = 0 if $o->{steps}{installPackages}{done} && install::pkgs::packagesToInstall($o->{packages}) > 0;
@@ -287,29 +330,191 @@ sub exitInstall {
     installStepsCall($o, $auto, 'exitInstall', getNextStep($::o) eq 'exitInstall');
 }
 
+#-######################################################################################
+
+=head1 Udev Functions
+
+=over
+
+=cut
+
+#-######################################################################################
+
+=item start_udev()
+
+=cut
+
+sub start_udev() {
+    return if fuzzy_pidofs('udevd');
+
+    # Start up udev:
+    mkdir_p("/run/udev/rules.d");
+    $ENV{UDEVRULESD} = "/run/udev/rules.d";
+    run_program::run("/usr/lib/systemd/systemd-udevd", "--daemon", "--resolve-names=never");
+    # Coldplug all devices:
+    run_program::run("udevadm", "trigger", "--type=subsystems", "--action=add");
+    run_program::run("udevadm", "trigger", "--type=devices", "--action=add");
+}
+
+=item stop_udev()
+
+=cut
+
+sub stop_udev() {
+    kill 15, fuzzy_pidofs('udevd');
+    sleep(2);
+    fs::mount::umount($_) foreach '/dev/pts', '/dev/shm';
+}
 
 #-######################################################################################
-#- MAIN
+
+=back
+
+=head1 Other Functions
+
+=over
+
+=cut
+
 #-######################################################################################
-sub main {
-#-    $SIG{__DIE__} = sub { warn "DIE " . backtrace() . "\n" };
-    $SIG{SEGV} = sub { 
-	my $msg = "segmentation fault: install crashed (maybe memory is missing?)\n" . backtrace();
-	log::l("$msg\n" . backtrace());
-	$o->ask_warn('', $msg);
-	setVirtual(1);
-	require install::steps_auto_install;
-	install::steps_auto_install_non_interactive::errorInStep($o, $msg);
-    };
-    $ENV{PERL_BADLANG} = 1;
-    delete $ENV{TERMINFO};
-    umask 022;
 
-    $::isWizard = 1;
-    $::no_ugtk_init = 1;
+sub init_local_install {
+    my ($o) = @_;
+    push @::auto_steps, 
+#      'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass',
+      'doPartitionDisks', 'formatPartitions';
+	fs::mount::sys_kernel_debug('');  #- do it now so that when_load doesn't do it
+	$o->{nomouseprobe} = 1;
+	$o->{mouse} = mouse::fullname2mouse('Universal|Any PS/2 & USB mice');
+}
 
-    push @::textdomains, 'DrakX', 'drakx-net', 'drakx-kbd-mouse-x11';
+sub pre_init_brltty() {
+    if (my ($s) = cat_("/proc/cmdline") =~ /brltty=(\S*)/) {
+	my ($driver, $device, $table) = split(',', $s);
+	$table = "text.$table.tbl" if $table !~ /\.tbl$/;
+	log::l("brltty option $driver $device $table");
+	$o->{brltty} = { driver => $driver, device => $device, table => $table };
+	$o->{interactive} = 'curses';
+	$o->{nomouseprobe} = 1;
+    }
+}
+
+sub init_brltty() {
+    symlink "/tmp/stage2/$_", $_ foreach "/etc/brltty";
+    devices::make($_) foreach $o->{brltty}{device};
+    run_program::run("brltty");
+}
+
+sub init_auto_install() {
+    if ($::auto_install =~ /-IP(\.pl)?$/) {
+        my ($ip) = cat_('/tmp/stage1.log') =~ /configuring device (?!lo)\S+ ip: (\S+)/;
+        my $normalized_ip = join('', map { sprintf "%02X", $_ } split('\.', $ip)); 
+        $::auto_install =~ s/-IP(\.pl)?$/-$normalized_ip$1/;
+    }
+    require install::steps_auto_install;
+    eval { $o = $::o = install::any::loadO($o, $::auto_install) };
+    if ($@) {
+        if ($o->{useless_thing_accepted}) { #- Pixel's hack to be able to fail through
+            log::l("error using auto_install, continuing");
+            undef $::auto_install;
+        } else {
+            install::steps_auto_install_non_interactive::errorInStep($o, "Error using auto_install\n" . formatError($@));
+        }
+    } else {
+        log::l("auto install config file loaded successfully");
+
+        #- normalize for people not using our special scheme
+        foreach (@{$o->{manualFstab} || []}) {
+            $_->{device} =~ s!^/dev/!!;
+        }
+    }
+}
+
+sub step_init {
+  my ($o) = @_;
+  my $o_;
+  while (1) {
+      $o_ = $::auto_install ?
+    	  install::steps_auto_install->new($o) :
+    	    $o->{interactive} eq "stdio" ?
+    	  install::steps_stdio->new($o) :
+    	    $o->{interactive} eq "curses" ?
+    	  install::steps_curses->new($o) :
+    	    $o->{interactive} eq "gtk" ?
+    	  install::steps_gtk->new($o) :
+    	    die "unknown install type";
+      $o_ and last;
+
+      log::l("$o->{interactive} failed, trying again with curses");
+      $o->{interactive} = "curses";
+      require install::steps_curses;
+  }
+  $o;
+}
+
+sub read_product_id() {
+    my $product_id = cat__(install::any::getFile_($o->{stage2_phys_medium}, "product.id"));
+    log::l('product_id: ' . chomp_($product_id));
+    $o->{product_id} = common::parse_LDAP_namespace_structure($product_id);
+ 
+    $o->{meta_class} ||= {
+        One          => 'desktop',
+        Free         => 'download',
+        Powerpack    => 'powerpack',
+    }->{$o->{product_id}{product}} || 'download';
+}
+
+sub sig_segv_handler() {
+    my $msg = "segmentation fault: install crashed (maybe memory is missing?)\n" . backtrace();
+    log::l("$msg\n");
+    # perl_checker: require UNIVERSAL
+    UNIVERSAL::can($o, 'ask_warn') and $o->ask_warn('', $msg);
+    setVirtual(1);
+    require install::steps_auto_install;
+    install::steps_auto_install_non_interactive::errorInStep($o, $msg);
+}
+
+=item read_stage1_net_conf() {
+
+Reads back netork configuration done by stage1 (see L<stages>).
+
+=cut
+
+sub read_stage1_net_conf() {
+    require network::network;
+    #- get stage1 network configuration if any.
+    log::l('found /tmp/network');
+    add2hash($o->{net}{network} ||= {}, network::network::read_conf('/tmp/network'));
+    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;
+    }
+    my $dsl_device = find { $_->{BOOTPROTO} eq 'adsl_pppoe' } values %{$o->{net}{ifcfg}};
+    if ($dsl_device) {
+        $o->{net}{type} = 'adsl';
+        $o->{net}{net_interface} = $dsl_device->{DEVICE};
+        $o->{net}{adsl} = {
+            method => 'pppoe',
+            device => $dsl_device->{DEVICE},
+            ethernet_device => $dsl_device->{DEVICE},
+            login => $dsl_device->{USER},
+            password => $dsl_device->{PASS},
+        };
+        %$dsl_device = ();
+    } else {
+        $o->{net}{type} = 'lan';
+        $o->{net}{net_interface} = first(values %{$o->{net}{ifcfg}});
+    }
+}
+
+=item parse_args($cfg, $patch)
+
+Parse arguments (which came from either the boot loader command line or its configuration file).
 
+=cut
+
+sub parse_args {
     my ($cfg, $patch);
     my %cmdline = map { 
 	my ($n, $v) = split /=/;
@@ -333,44 +538,61 @@ sub main {
     map_each {
 	my ($n, $v) = @_;
 	my $f = ${{
+	    keyboard  => sub { $o->{keyboard} = $v; push @::auto_steps, 'selectKeyboard' },
 	    lang      => sub { $o->{lang} = $v },
 	    flang     => sub { $o->{lang} = $v; push @::auto_steps, 'selectLanguage' },
 	    langs     => sub { $o->{locale}{langs} = +{ map { $_ => 1 } split(':', $v) } },
 	    method    => sub { $o->{method} = $v },
 	    pcmcia    => sub { $o->{pcmcia} = $v },
-	    vga16     => sub { $o->{vga16} = $v },
-	    vga       => sub { $o->{vga} = $v =~ /0x/ ? hex($v) : $v },
 	    step      => sub { $o->{steps}{first} = $v },
 	    meta_class => sub { $o->{meta_class} = $v },
 	    freedriver => sub { $o->{freedriver} = $v },
+
+	    # fs/block options:
 	    no_bad_drives => sub { $o->{partitioning}{no_bad_drives} = 1 },
 	    nodmraid  => sub { $o->{partitioning}{nodmraid} = 1 },
-	    debug_urpmi  => sub { $o->{debug_urpmi} = 1 },
 	    readonly  => sub { $o->{partitioning}{readonly} = $v ne "0" },
+	    use_uuid  => sub { $::no_uuid_by_default = !$v },
+
+	    # urpmi options:
+	    debug_urpmi  => sub { $o->{debug_urpmi} = 1 },
+	    deploops     => sub { $o->{deploops} = 1 },
+	    justdb    => sub { $o->{justdb} = 1 },
+	    'tune-rpm' => sub { $o->{'tune-rpm'} = 'all' },
+
+	    # GUI options:
+	    vga16     => sub { $o->{vga16} = $v },
+	    vga       => sub { $o->{vga} = $v =~ /0x/ ? hex($v) : $v },
 	    display   => sub { $o->{display} = $v },
 	    askdisplay => sub { print "Please enter the X11 display to perform the install on ? "; $o->{display} = chomp_(scalar(<STDIN>)) },
+	    text      => sub { $o->{interactive} = "curses" },
+	    stdio     => sub { $o->{interactive} = "stdio" },
+	    newt      => sub { $o->{interactive} = "curses" },
+	    simple_themes => sub { $o->{simple_themes} = 1 },
+	    theme     => sub { $o->{theme} = $v },
+	    doc       => sub { $o->{doc} = 1 },  #- will be used to know that we're running for the doc team,
+	                                         #- e.g. we want screenshots with a good B&W contrast
+
 	    security  => sub { $o->{security} = $v },
+
+	    # auto install options:
 	    noauto    => sub { $::noauto = 1 },
 	    testing   => sub { $::testing = 1 },
 	    patch     => sub { $patch = 1 },
 	    defcfg    => sub { $cfg = $v },
-	    newt      => sub { $o->{interactive} = "curses" },
-	    text      => sub { $o->{interactive} = "curses" },
-	    stdio     => sub { $o->{interactive} = "stdio" },
-	    use_uuid  => sub { $::no_uuid_by_default = !$v },
 	    kickstart => sub { $::auto_install = $v },
+
 	    local_install => sub { $::local_install = 1 },
 	    uml_install => sub { $::uml_install = $::local_install = 1 },
 	    auto_install => sub { $::auto_install = $v },
-	    simple_themes => sub { $o->{simple_themes} = 1 },
-	    theme     => sub { $o->{theme} = $v },
-	    doc       => sub { $o->{doc} = 1 },  #- will be used to know that we're running for the doc team,
-	                                         #- e.g. we want screenshots with a good B&W contrast
+
+	    # debugging options:
 	    useless_thing_accepted => sub { $o->{useless_thing_accepted} = 1 },
 	    alawindows => sub { $o->{security} = 0; $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 },
 	    fdisk => sub { $o->{partitioning}{fdisk} = 1 },
 	    nomouseprobe => sub { $o->{nomouseprobe} = $v },
 	    updatemodules => sub { $o->{updatemodules} = 1 },
+
 	    suppl => sub { $o->{supplmedia} = $v },
 	    askmedia => sub { $o->{askmedia} = 1 },
 	    restore => sub { $::isRestore = 1 },
@@ -378,12 +600,103 @@ sub main {
 	}}{lc $n}; &$f if $f;
     } %cmdline;
 
+    ($cfg, $patch);
+}
+
+sub init_env_share() {
     if ($::testing) {
 	$ENV{SHARE_PATH} ||= "/export/install/stage2/live/usr/share";
 	$ENV{SHARE_PATH} = "/usr/share" if !-e $ENV{SHARE_PATH};
     } else {
 	$ENV{SHARE_PATH} ||= "/usr/share";
     }
+}
+
+sub init_path() {
+    #-  make sure we do not pick up any gunk from the outside world
+    my $remote_path = "$::prefix/sbin:$::prefix/bin:$::prefix/usr/sbin:$::prefix/usr/bin";
+    $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:$remote_path";
+}
+
+sub init_mouse() {
+    eval { $o->{mouse} = mouse::detect($o->{modules_conf}) } if !$o->{mouse} && !$o->{nomouseprobe};
+    mouse::load_modules($o->{mouse});
+}
+
+sub init_modules_conf() {
+    list_modules::load_default_moddeps();
+    require modules::any_conf;
+    require modules::modules_conf;
+    # read back config from stage1:
+    $o->{modules_conf} = modules::modules_conf::read(modules::any_conf::vnew(), '/tmp/modules.conf');
+    modules::read_already_loaded($o->{modules_conf});
+}
+
+sub process_auto_steps() {
+    foreach (@::auto_steps) {
+	if (my $s = $o->{steps}{/::(.*)/ ? $1 : $_}) {
+	    $s->{auto} = $s->{hidden} = 1;
+	} else {
+	    log::l("ERROR: unknown step $_ in auto_steps");
+	}
+    }
+}
+
+=item process_patch($cfg, $patch)
+
+Handle installer live patches:
+
+=over 4
+
+=item * OEM patch (C<install/patch-oem.pl>)
+
+=item * defcfg (the file indicated by the defcfg option)
+
+=item * patch (C<patch> file)
+
+=back
+
+=cut
+
+sub process_patch {
+    my ($cfg, $patch) = @_;
+    #- oem patch should be read before to still allow patch or defcfg.
+    eval { $o = $::o = install::any::loadO($o, "install/patch-oem.pl"); log::l("successfully read oem patch") };
+    #- patch should be read after defcfg in order to take precedence.
+    eval { $o = $::o = install::any::loadO($o, $cfg); log::l("successfully read default configuration: $cfg") } if $cfg;
+    eval { $o = $::o = install::any::loadO($o, "patch"); log::l("successfully read patch") } if $patch;
+}
+
+#-######################################################################################
+
+=item main()
+
+This is the main function, the installer entry point called by runinstall2:
+
+=over 4
+
+=item * initialization
+
+=item * steps
+
+=back
+
+=cut
+#-######################################################################################
+sub main {
+    $SIG{SEGV} = \&sig_segv_handler;
+    $ENV{PERL_BADLANG} = 1;
+    delete $ENV{TERMINFO};
+    umask 022;
+
+    $::isWizard = 1;
+    $::no_ugtk_init = 1;
+
+    push @::textdomains, 'DrakX', 'drakx-net', 'drakx-kbd-mouse-x11';
+
+    my ($cfg, $patch) = parse_args(@_);
+
+    init_env_share();
 
     undef $::auto_install if $cfg;
 
@@ -391,103 +704,41 @@ sub main {
 
     log::l("second stage install running (", install::any::drakx_version($o), ")");
 
-    eval { output('/proc/sys/kernel/modprobe', "\n") } if !$::local_install && !$::testing; #- disable kmod
-    eval { fs::mount::mount('none', '/sys', 'sysfs', 1) };
     eval { touch('/root/non-chrooted-marker.DrakX') }; #- helps distinguishing /root and /mnt/root when we don't know if we are chrooted
 
     if ($::local_install) {
-	push @::auto_steps, 
-#	  'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass',
-	  'doPartitionDisks', 'formatPartitions';
-	fs::mount::usbfs(''); #- do it now so that when_load doesn't do it
-	$o->{nomouseprobe} = 1;
-	$o->{mouse} = mouse::fullname2mouse('Universal|Any PS/2 & USB mice');
+        init_local_install($o);
+    } else {
+        start_udev();
+        # load some modules early but asynchronously:
+        run_program::raw({ detach => 1 }, 'modprobe', 'microcode');
     }
 
     $o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : "/mnt";
-    mkdir $::prefix, 0755;
+    mkdir $::prefix, 0755 if ! -d $::prefix;
 
-    #-  make sure we do not pick up any gunk from the outside world
-    my $remote_path = "$::prefix/sbin:$::prefix/bin:$::prefix/usr/sbin:$::prefix/usr/bin:$::prefix/usr/X11R6/bin";
-    $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:$remote_path";
+    init_path();
 
     eval { install::any::spawnShell() };
 
-    list_modules::load_default_moddeps();
-    require modules::any_conf;
-    require modules::modules_conf;
-    $o->{modules_conf} = modules::modules_conf::read(modules::any_conf::vnew(), '/tmp/modules.conf');
-    modules::read_already_loaded($o->{modules_conf});
+    init_modules_conf();
 
     #- done before auto_install is called to allow the -IP feature on auto_install file name
-    if (-e '/tmp/network') {
-	require network::network;
-	#- 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-*')) {
-	    log::l("found network config file $file");
-	    my $l = network::network::read_interface_conf($file);
-	    $o->{net}{ifcfg}{$l->{DEVICE}} ||= $l;
-	}
-	my $dsl_device = find { $_->{BOOTPROTO} eq 'adsl_pppoe' } values %{$o->{net}{ifcfg}};
-	if ($dsl_device) {
-	    $o->{net}{type} = 'adsl';
-	    $o->{net}{net_interface} = $dsl_device->{DEVICE};
-	    $o->{net}{adsl} = {
-		method => 'pppoe',
-		device => $dsl_device->{DEVICE},
-		ethernet_device => $dsl_device->{DEVICE},
-		login => $dsl_device->{USER},
-		password => $dsl_device->{PASS},
-	    };
-	    %$dsl_device = ();
-	} else {
-	    $o->{net}{type} = 'lan';
-	    $o->{net}{net_interface} = first(values %{$o->{net}{ifcfg}});
-	}
-    }
+    read_stage1_net_conf() if -e '/tmp/network';
 
     #- done after module dependencies are loaded for "vfat depends on fat"
     if ($::auto_install) {
-	if ($::auto_install =~ /-IP(\.pl)?$/) {
-	    my ($ip) = cat_('/tmp/stage1.log') =~ /configuring device (?!lo)\S+ ip: (\S+)/;
-	    my $normalized_ip = join('', map { sprintf "%02X", $_ } split('\.', $ip)); 
-	    $::auto_install =~ s/-IP(\.pl)?$/-$normalized_ip$1/;
-	}
-	require install::steps_auto_install;
-	eval { $o = $::o = install::any::loadO($o, $::auto_install) };
-	if ($@) {
-	    if ($o->{useless_thing_accepted}) { #- Pixel's hack to be able to fail through
-		log::l("error using auto_install, continuing");
-		undef $::auto_install;
-	    } else {
-		install::steps_auto_install_non_interactive::errorInStep($o, "Error using auto_install\n" . formatError($@));
-	    }
-	} else {
-	    log::l("auto install config file loaded successfully");
-
-	    #- normalize for people not using our special scheme
-	    foreach (@{$o->{manualFstab} || []}) {
-		$_->{device} =~ s!^/dev/!!;
-	    }
-	}
+        init_auto_install();
+    } else {
+        $o->{interactive} ||= 'gtk';
     }
-    $o->{interactive} ||= 'gtk' if !$::auto_install;
  
     if ($o->{interactive} eq "gtk" && availableMemory() < 22 * 1024) {
  	log::l("switching to curses install cuz not enough memory");
  	$o->{interactive} = "curses";
     }
 
-    if (my ($s) = cat_("/proc/cmdline") =~ /brltty=(\S*)/) {
-	my ($driver, $device, $table) = split(',', $s);
-	$table = "text.$table.tbl" if $table !~ /\.tbl$/;
-	log::l("brltty option $driver $device $table");
-	$o->{brltty} = { driver => $driver, device => $device, table => $table };
-	$o->{interactive} = 'curses';
-	$o->{nomouseprobe} = 1;
-    }
+    pre_init_brltty();
 
     # perl_checker: require install::steps_gtk
     # perl_checker: require install::steps_curses
@@ -497,11 +748,7 @@ sub main {
     #- needed before accessing floppy (in case of usb floppy)
     modules::load_category($o->{modules_conf}, 'bus/usb'); 
 
-    #- oem patch should be read before to still allow patch or defcfg.
-    eval { $o = $::o = install::any::loadO($o, "install/patch-oem.pl"); log::l("successfully read oem patch") };
-    #- patch should be read after defcfg in order to take precedance.
-    eval { $o = $::o = install::any::loadO($o, $cfg); log::l("successfully read default configuration: $cfg") } if $cfg;
-    eval { $o = $::o = install::any::loadO($o, "patch"); log::l("successfully read patch") } if $patch;
+    process_patch($cfg, $patch);
 
     eval { modules::load("af_packet") };
 
@@ -509,18 +756,10 @@ sub main {
     harddrake::sound::configure_sound_slots($o->{modules_conf});
 
     #- need to be after oo-izing $o
-    if ($o->{brltty}) {
-	symlink "/tmp/stage2/$_", $_ foreach "/etc/brltty";
-	devices::make($_) foreach $o->{brltty}{device} ? $o->{brltty}{device} : qw(ttyS0 ttyS1);
-	devices::make("vcsa");
-	run_program::run("brltty");
-    }
+    init_brltty() if $o->{brltty};
 
     #- needed very early for install::steps_gtk
-    if (!$::testing) {
-	eval { $o->{mouse} = mouse::detect($o->{modules_conf}) } if !$o->{mouse} && !$o->{nomouseprobe};
-	mouse::load_modules($o->{mouse});
-    }
+    init_mouse() if !$::testing;
 
     #- for auto_install compatibility with old $o->{lang},
     #- and also for --lang and --flang
@@ -534,60 +773,41 @@ sub main {
 
     $o->{allowFB} = listlength(cat_("/proc/fb"));
 
-    if (!$::testing) {
-	my $product_id = cat__(install::any::getFile_($o->{stage2_phys_medium}, "product.id"));
-	log::l('product_id: ' . chomp_($product_id));
-	$o->{product_id} = common::parse_LDAP_namespace_structure($product_id);
-
-	$o->{meta_class} ||= {
-	    One          => 'desktop',
-	    Free         => 'download',
-	    Powerpack    => 'powerpack',
-	}->{$o->{product_id}{product}} || 'download';
-    }
+    read_product_id() if !$::testing;
 
     log::l("META_CLASS=$o->{meta_class}");
-    $ENV{META_CLASS} = $o->{meta_class}; #- for Ia Ora
 
-    foreach (@::auto_steps) {
-	if (my $s = $o->{steps}{/::(.*)/ ? $1 : $_}) {
-	    $s->{auto} = $s->{hidden} = 1;
-	} else {
-	    log::l("ERROR: unknown step $_ in auto_steps");
-	}
-    }
+    process_auto_steps();
 
-    my $o_;
-    while (1) {
-    	$o_ = $::auto_install ?
-    	  install::steps_auto_install->new($o) :
-    	    $o->{interactive} eq "stdio" ?
-    	  install::steps_stdio->new($o) :
-    	    $o->{interactive} eq "curses" ?
-    	  install::steps_curses->new($o) :
-    	    $o->{interactive} eq "gtk" ?
-    	  install::steps_gtk->new($o) :
-    	    die "unknown install type";
-	$o_ and last;
-
-	log::l("$o->{interactive} failed, trying again with curses");
-	$o->{interactive} = "curses";
-	require install::steps_curses;
-    }
-    $::o = $o = $o_;
+    $ENV{COLUMNS} ||= 80;
+    $ENV{LINES}   ||= 25;
+    $::o = $o = step_init($o);
 
     eval { output('/proc/splash', "verbose\n") };
   
-    #-the main cycle
+    real_main();
+    finish_install();
+}
+
+=item real_main() {
+
+Go through the steps cycle
+
+=cut
+
+sub real_main() {
     MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep($o)) {
 	$o->{steps}{$o->{step}}{entered}++;
 	$o->enteringStep($o->{step});
+	my $time = time();
 	eval {
 	    &{$install::install2::{$o->{step}}}($o->{steps}{$o->{step}}{auto});
 	};
 	my $err = $@;
+	log::l("step \"$o->{step}\" took: ", formatTimeRaw(time() - $time));
 	$o->kill_action;
 	if ($err) {
+	    log::l("step \"$o->{step}\" failed with error: $err");
 	    local $_ = $err;
 	    $o->kill_action;
 	    if (!/^already displayed/) {
@@ -605,6 +825,15 @@ sub main {
 
 	last if $o->{step} eq 'exitInstall';
     }
+}
+
+=item finish_install() {
+
+Clean up the installer before the final reboot.
+
+=cut
+
+sub finish_install() {
     unlink $install::any::compressed_image_on_disk;
     install::media::clean_postinstall_rpms();
     install::media::log_sizes();
@@ -618,7 +847,8 @@ sub main {
     #- make sure failed upgrade will not hurt too much.
     install::steps::cleanIfFailedUpgrade($o);
 
-    -e "$::prefix/usr/sbin/urpmi.update" or eval { rm_rf("$::prefix/var/lib/urpmi") };
+    #- drop urpmi DB if urpmi is not installed:
+    -e "$::prefix/usr/sbin/urpmi" or eval { rm_rf("$::prefix/var/lib/urpmi") };
 
     system("chroot", $::prefix, "bash", "-c", $o->{postInstallBeforeReboot}) if $o->{postInstallBeforeReboot};
 
@@ -628,9 +858,14 @@ sub main {
     #- ala pixel? :-) [fpons]
     common::sync(); common::sync();
 
+    stop_udev() if !$::local_install;
     log::l("installation complete, leaving");
     log::l("files still open by install2: ", readlink($_)) foreach glob_("/proc/self/fd/*");
     print "\n" x 80 if !$::local_install;
 }
 
+=back
+
+=cut
+
 1;
diff --git a/perl-install/install/interactive.pm b/perl-install/install/interactive.pm
index d217d145d..7faa7bdd8 100644
--- a/perl-install/install/interactive.pm
+++ b/perl-install/install/interactive.pm
@@ -1,4 +1,4 @@
-package install::interactive; # $Id: interactive.pm 215411 2007-04-25 12:26:16Z pixel $
+package install::interactive;
 
 use diagnostics;
 use strict;
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index acebc2128..11a92691b 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -1,4 +1,4 @@
-package install::media; # $Id: media.pm 269998 2010-06-11 17:28:57Z blino $
+package install::media;
 
 use strict;
 
@@ -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) = @_;
 
@@ -63,6 +58,7 @@ sub packageMedium {
    my ($packages, $p) = @_;
    URPM::pkg2media($packages->{media}, $p) || {};
 }
+
 sub packagesOfMedium {
     my ($packages, $medium) = @_;
 
@@ -104,6 +100,7 @@ sub umount_phys_medium {
     }
     $ok;
 }
+
 sub _mount_phys_medium {
     my ($phys_m, $o_rel_file, $b_force_change) = @_;
 
@@ -170,7 +167,7 @@ sub stage2_phys_medium {
 	my $user = $ENV{LOGIN} && ($ENV{LOGIN} . ($ENV{PASSWORD} && ":$ENV{PASSWORD}") . '@');
 	$ENV{URLPREFIX} = "ftp://$user$ENV{HOST}/$ENV{PREFIX}";
     }
-    if ($method eq 'http' || $method eq 'ftp') {
+    if (member($method, qw(http ftp))) {
 	{ method => $method, url => $ENV{URLPREFIX} };
     } elsif ($method =~ /(.*)-iso$/) {
 	my $dir_method = $1;
@@ -284,6 +281,7 @@ sub _iso_phys_media {
 	mntpoint => $mntpoint, rel_path => $rel_path,
     };
 }
+
 sub _get_phys_media_iso {
     my ($all_hds, $main_phys_m, $names) = @_;
 
@@ -296,6 +294,7 @@ sub _get_phys_media_iso {
 	$m;
     } @ISOs;
 }
+
 sub _look_for_ISO_images {
     my ($main_iso) = @_;
 
@@ -332,6 +331,7 @@ sub _open_file_and_size {
     my $fh = common::open_file($f) or return;
     $size, $fh;
 }
+
 sub getFile_ {
     my ($phys_m, $f) = @_;
     log::l("getFile $f on " . phys_medium_to_string($phys_m) . "");
@@ -339,6 +339,7 @@ sub getFile_ {
     my ($_size, $fh) = get_file_and_size($phys_m, $f) or return;
     $fh;
 }
+
 sub get_file_and_size {
     my ($phys_m, $f) = @_;
 
@@ -367,6 +368,7 @@ sub getAndSaveFile_ {
     my $fh = getFile_($phys_m, $file) or return;
     _getAndSaveFile_raw($fh, $local);
 }
+
 sub _getAndSaveFile_progress {
     my ($in_wait, $msg, $phys_m, $file, $local) = @_;
     my ($size, $fh) = get_file_and_size($phys_m, $file) or return;
@@ -376,6 +378,7 @@ sub _getAndSaveFile_progress {
 	_getAndSaveFile_raw($fh, $local);
     }
 }
+
 sub _getAndSaveFile_raw {
     my ($fh, $local) = @_;
 
@@ -386,6 +389,7 @@ sub _getAndSaveFile_raw {
     while (<$fh>) { syswrite($F, $_) or unlink($local), die("getAndSaveFile($local): $!") }
     1;
 }
+
 sub _getAndSaveFile_progress_raw {
     my ($in_wait, $msg, $size, $fh, $local) = @_;
 
@@ -393,6 +397,7 @@ sub _getAndSaveFile_progress_raw {
     open(my $out, ">$local") or log::l("getAndSaveFile(opening $local): $!"), return;
     _print_with_progress($in_wait, $msg, $size, $fh, $out) or unlink($local), die("getAndSaveFile($local): $!");
 }
+
 sub _print_with_progress {
     my ($in_wait, $msg, $size, $in, $out) = @_;
 
@@ -417,19 +422,12 @@ sub _print_with_progress {
     1;
 }
 
-
 sub urpmidir() {
     my $v = "$::prefix/var/lib/urpmi";
     -l $v && !-e $v and unlink $v and mkdir $v, 0755; #- dangling symlink
     -w $v ? $v : '/tmp';
 }
 
-sub hdlist_on_disk {
-    my ($m) = @_;
-
-    urpmidir() . "/hdlist.$m->{fakemedium}.cz";
-}
-
 sub _allow_copy_rpms_on_disk {
     my ($medium, $hdlists) = @_;
 
@@ -477,22 +475,21 @@ sub _parse_media_cfg {
 sub select_only_some_media {
     my ($media_list, $selected_names) = @_;
     my @names = split(',', $selected_names);
-    foreach my $m (@{$media_list}) {
+    foreach my $m (@$media_list) {
         my $bool = !member($m->{name}, @names);
         # workaround urpmi transforming "ignore => ''" or "ignore => 0" into "ignore => 1":
         undef $bool if !$bool;
-        log::l "disabling '$m->{name}' medium: " . to_bool($bool);
+        log::l("disabling '$m->{name}' medium: " . to_bool($bool));
         urpm::media::_tempignore($m, $bool);
         # make sure we update un-ignored media (eg: */Testing and the like):
         $m->{modified} = 1 if !$bool;
     }
 }
 
-sub configure_media {
+sub update_media {
     my ($packages) = @_;
     urpm::media::update_media($packages, distrib => 1, callback => \&urpm::download::sync_logger) or
         log::l('updating media failed');
-    urpm::media::configure($packages);
 }
 
 sub get_media {
@@ -535,8 +532,8 @@ sub adjust_paths_in_urpmi_cfg {
             $medium->{url} =~ s!^.*?/media/!$phys_m->{url}/!;
         } elsif (member($phys_m->{method}, qw(disk nfs))) {
             # use the real mount point:
-            if ($medium->{url} =~ m!/tmp/image!) {
-                $medium->{url} =~ s!/tmp/image!$phys_m->{mntpoint}!;
+            if ($medium->{url} =~ m!/tmp/image(/media)?!) {
+                $medium->{url} =~ s!/tmp/image(/media)?!$phys_m->{mntpoint}$phys_m->{rel_path}!;
             } else {
                 # just remove $::prefix and we already have the real mount point:
                 $medium->{url} =~ s!^$::prefix!!;
@@ -706,13 +703,13 @@ sub get_standalone_medium {
 }
 
 sub _get_medium {
-    my ($in_wait, $phys_m, $packages, $m) = @_;
+    my ($_in_wait, $phys_m, $packages, $m) = @_;
 
     !$m->{ignore} or log::l("ignoring packages in $m->{rel_hdlist}"), return;
 
     my $url = _get_media_url({}, $phys_m);
     log::l("trying '$url'\n");
-    urpm::media::add_medium($packages, $m->{name} || 'Supplementary medium', $url) or $packages->{fatal}(10, N("unable to add medium"));
+    urpm::media::add_medium($packages, $m->{name} || 'Supplementary medium', $url, 0) or $packages->{fatal}(10, N("unable to add medium"));
 }
 
 
@@ -837,7 +834,7 @@ sub copy_rpms_on_disk {
 
 sub _get_medium_dir {
     my ($phys_m) = @_;
-    if ($phys_m->{method} eq 'ftp' || $phys_m->{method} eq 'http' || $phys_m->{method} eq 'cdrom') {
+    if (member($phys_m->{method}, qw(ftp http cdrom))) {
         $phys_m->{url};
     } else {
         "$phys_m->{mntpoint}$phys_m->{rel_path}";
diff --git a/perl-install/install/pixmaps/desktop-Custom-big.png b/perl-install/install/pixmaps/desktop-Custom-big.png
index 834481afe..80b99eef8 100644
--- a/perl-install/install/pixmaps/desktop-Custom-big.png
+++ b/perl-install/install/pixmaps/desktop-Custom-big.png
diff --git a/perl-install/install/pixmaps/desktop-Custom.png b/perl-install/install/pixmaps/desktop-Custom.png
index cac6d49d5..6bfffc2f0 100644
--- a/perl-install/install/pixmaps/desktop-Custom.png
+++ b/perl-install/install/pixmaps/desktop-Custom.png
diff --git a/perl-install/install/pixmaps/desktop-GNOME-big.png b/perl-install/install/pixmaps/desktop-GNOME-big.png
index 010ad85af..950ad9928 100644
--- a/perl-install/install/pixmaps/desktop-GNOME-big.png
+++ b/perl-install/install/pixmaps/desktop-GNOME-big.png
diff --git a/perl-install/install/pixmaps/desktop-GNOME.png b/perl-install/install/pixmaps/desktop-GNOME.png
index 9b9be2e04..e5b6a935d 100644
--- a/perl-install/install/pixmaps/desktop-GNOME.png
+++ b/perl-install/install/pixmaps/desktop-GNOME.png
diff --git a/perl-install/install/pixmaps/desktop-KDE-big.png b/perl-install/install/pixmaps/desktop-KDE-big.png
index e8902133a..b98c8544c 100644
--- a/perl-install/install/pixmaps/desktop-KDE-big.png
+++ b/perl-install/install/pixmaps/desktop-KDE-big.png
diff --git a/perl-install/install/pixmaps/desktop-KDE.png b/perl-install/install/pixmaps/desktop-KDE.png
index c10a6a9e6..88f6576f1 100644
--- a/perl-install/install/pixmaps/desktop-KDE.png
+++ b/perl-install/install/pixmaps/desktop-KDE.png
diff --git a/perl-install/install/pixmaps/langs/lang-qu.png b/perl-install/install/pixmaps/langs/lang-qu.png
index 53e233cdb..ec688f96d 100644
--- a/perl-install/install/pixmaps/langs/lang-qu.png
+++ b/perl-install/install/pixmaps/langs/lang-qu.png
diff --git a/perl-install/install/pixmaps/left-background.png b/perl-install/install/pixmaps/left-background.png
index 96288bc1a..e2d29cd17 100644
--- a/perl-install/install/pixmaps/left-background.png
+++ b/perl-install/install/pixmaps/left-background.png
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index d248a6e3c..04d281f35 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -1,6 +1,7 @@
-package install::pkgs; # $Id: pkgs.pm 267288 2010-04-02 14:49:40Z pterjan $
+package install::pkgs;
 
 use strict;
+use feature 'state';
 
 BEGIN {
     # needed before "use URPM"
@@ -26,7 +27,6 @@ use fs::any;
 use fs::loopback;
 use c;
 
-
 #- lower bound on the left ( aka 90 means [90-100[ )
 our %compssListDesc = (
    5 => N_("must have"),
@@ -81,6 +81,44 @@ sub size2time {
     }
 }
 
+# Based on Rpmdrake::pkg::extract_header():
+sub get_pkg_info {
+    my ($p) = @_;
+
+    my $urpm = $::o->{packages};
+    my $name = $p->fullname;
+
+    my $medium = URPM::pkg2media($urpm->{media}, $p);
+    my ($local_source, %xml_info_pkgs, $description);
+    my $dir = urpm::file_from_local_url($medium->{url});
+    $local_source = "$dir/" . $p->filename if $dir;
+
+    if (-s $local_source) {
+	log::l("getting information from $dir...");
+	$p->update_header($local_source) and $description = $p->description;
+	log::l("Warning, could not extract header for $name from $medium!") if !$description;
+    }
+    if (!$description) {
+	my $_w = $::o->wait_message(undef, N("Getting package information from XML meta-data..."));
+	if (my $xml_info_file = eval { urpm::media::any_xml_info($urpm, $medium, 'info', undef, urpm::download::sync_logger) }) {
+	    require urpm::xml_info;
+	    require urpm::xml_info_pkg;
+	    log::l("getting information from $xml_info_file");
+	    my %nodes = eval { urpm::xml_info::get_nodes('info', $xml_info_file, [ $name ]) };
+	    goto header_non_available if $@;
+	    put_in_hash($xml_info_pkgs{$name} ||= {}, $nodes{$name});
+	} else {
+	    $urpm->{info}(N("No xml info for medium \"%s\", only partial result for package %s", $medium->{name}, $name));
+	}
+    }
+
+    if (!$description && $xml_info_pkgs{$name}) {
+	$description = $xml_info_pkgs{$name}{description};
+    }
+  header_non_available:
+    $description || N("No description");
+}
+
 sub packagesProviding {
     my ($packages, $name) = @_;
     grep { $_->is_arch_compat } URPM::packages_providing($packages, $name);
@@ -88,15 +126,20 @@ sub packagesProviding {
 
 #- search package with given name and compatible with current architecture.
 #- take the best one found (most up-to-date).
+# FIXME: reuse urpmi higher level code instead!
 sub packageByName {
     my ($packages, $name) = @_;
 
-    my @l =  grep { $_->name eq $name } packagesProviding($packages, $name);
+    my @l =  sort { $b->id <=> $a->id } grep { $_->name eq $name } packagesProviding($packages, $name);
 
     my $best;
     foreach (@l) {
 	if ($best && $best != $_) {
-	    $_->compare_pkg($best) > 0 and $best = $_;
+	    if ($best->fullname eq $_->fullname) {
+		$best = $_ if $_->flag_installed;
+	    } else {
+	        $_->compare_pkg($best) > 0 and $best = $_;
+            }
 	} else {
 	    $best = $_;
 	}
@@ -105,14 +148,19 @@ sub packageByName {
     $best;
 }
 
+sub _is_kernelServer_needed() {
+    # forbid selecting kernel-server if not having PAE since PAE support is mandatory for kernel-server:
+    return if !detect_devices::has_cpu_flag('pae');
+    arch() =~ /i.86/ && detect_devices::dmi_detect_memory() > 3.8 * 1024 || detect_devices::isServer();
+}
+
 sub _bestKernel_extensions {
     my ($o_match_all_hardware) = @_;
 
     $::o->{kernel_extension} ? $::o->{kernel_extension} :
     $o_match_all_hardware ? (arch() =~ /i.86/ ? '-desktop586' : '-desktop') :
-      detect_devices::is_xbox() ? '-xbox' :
       detect_devices::is_i586() ? '-desktop586' :
-      arch() =~ /i.86/ && detect_devices::dmi_detect_memory() > 3.8 * 1024 || detect_devices::isServer() ? '-server' :
+      _is_kernelServer_needed() ? '-server' :
       '-desktop';
 }
 
@@ -142,7 +190,8 @@ sub packagesToInstall {
 	log::l("examining packagesToInstall of medium $_->{name}");
 	push @packages, grep { $_->flag_selected } install::media::packagesOfMedium($packages, $_);
     }
-    log::l("found " . scalar(@packages) . " packages to install");
+    log::l("found " . scalar(@packages) . " packages to install: " . formatList(5, map { scalar $_->fullname } @packages));
+
     @packages;
 }
 
@@ -156,7 +205,7 @@ sub _packageRequest {
     #- check for medium selection, if the medium has not been
     #- selected, the package cannot be selected.
     my $medium = packageMedium($packages, $pkg);
-    $medium and !$medium->{ignore} or return;
+    $medium && !$medium->{ignore} or return;
 
     +{ $pkg->id => 1 };
 }
@@ -240,15 +289,22 @@ sub select_by_package_names_or_die {
     }
 }
 
+my @recommended_package_ids;
 sub _resolve_requested_and_check {
     my ($packages, $state, $requested) = @_;
 
     my @l = $packages->resolve_requested($packages->{rpmdb}, $state, $requested,
-					 callback_choices => \&packageCallbackChoices, no_suggests => $::o->{no_suggests});
+					 callback_choices => \&packageCallbackChoices, no_recommends => $::o->{no_recommends});
+
+    #- keep track of recommended packages so that theys could be unselected if the "no recommends" option is choosen later:
+    if (!is_empty_hash_ref($state->{selected})) {
+        my @new_ids = map { $packages->{depslist}[$_]->id } grep { $state->{selected}{$_}{recommended} } keys %{$state->{selected}};
+        @recommended_package_ids = uniq(@recommended_package_ids, @new_ids);
+    }
 
     my $error;
     if (find { !exists $state->{selected}{$_} } keys %$requested) {
-	my @rejected = urpm::select::unselected_packages($packages, $state);
+	my @rejected = urpm::select::unselected_packages($state);
 	$error = urpm::select::translate_why_unselected($packages, $state, @rejected);
 	log::l("ERROR: selection failed: $error");
     }
@@ -296,7 +352,13 @@ sub unselectAllPackages {
     my %keep_selected;
     log::l("unselecting all packages...");
     foreach (@{$packages->{depslist}}) {
-	if ($_->flag_base || $_->flag_installed && $_->flag_selected) {
+	my $to_select = $_->flag_base || $_->flag_installed && $_->flag_selected;
+	# unselect recommended packages if minimal install:
+	if ($::o->{no_recommends} && member($_->id, @recommended_package_ids)) {
+	    log::l("unselecting recommended package " . $_->name);
+	    undef $to_select;
+	}
+	if ($to_select) {
 	    #- keep track of packages that should be kept selected.
 	    $keep_selected{$_->id} = $_;
 	} else {
@@ -310,6 +372,20 @@ sub unselectAllPackages {
     _resolve_requested_and_check($packages, $packages->{state}, \%keep_selected);
 }
 
+
+my (@errors, $push_errors);
+sub start_pushing_error() {
+    $push_errors = 1;
+    undef @errors;
+}
+
+sub popup_errors() {
+    if (@errors) {
+	$::o->ask_warn(undef, N("An error occurred:") . "\n\n" . join("\n", @errors));
+    }
+    undef $push_errors;
+}
+
 sub empty_packages {
     my ($o_keep_unrequested_dependencies) = @_;
     my $packages = urpm->new;
@@ -317,13 +393,21 @@ sub empty_packages {
     urpm::set_files($packages, '/mnt');
 
     #- add additional fields used by DrakX.
-    @$packages{qw(count media)} = (0, []);
+    $packages->{media} = [];
 
     urpm::args::set_debug($packages) if $::o->{debug_urpmi};
     $packages->{log} = \&log::l;
     $packages->{info} = \&log::l;
-    $packages->{fatal} = $packages->{error} = sub {
+    $packages->{fatal} = sub {
+        log::l("urpmi error: $_[1] ($_[0])\n" . common::backtrace());
+        $::o->ask_warn(undef, N("A fatal error occurred: %s.", "$_[1] ($_[0])"));
+    };
+    $packages->{error} = sub {
         log::l("urpmi error: $_[0]");
+	if ($push_errors) {
+	    push @errors, @_;
+	    return;
+	}
         $::o->ask_warn(undef, N("An error occurred:") . "\n\n" . $_[0]);
     };
     $packages->{root} = $::prefix;
@@ -331,11 +415,16 @@ sub empty_packages {
     $packages->{keep_unrequested_dependencies} =
       defined($o_keep_unrequested_dependencies) ? $o_keep_unrequested_dependencies : 1;
     $urpm::args::options{force_transactions} = 1;
+    $urpm::args::options{justdb} = $::o->{justdb};
+    urpm::set_tune_rpm($packages, $::o->{'tune-rpm'}) if $::o->{'tune-rpm'};
     $::force = 1;
     $packages->{options}{ignoresize} = 1;
-    $packages->{options}{'priority-upgrade'};  # prevent priority upgrade
+    # prevent priority upgrade (redundant for now as $urpm->{root} implies disabling it:
+    $packages->{options}{'priority-upgrade'} = undef;
     # log $trans->add() faillure; FIXME: should we override *urpm::msg::sys_log?
-    $packages->{debug} = \&log::l;
+    $packages->{debug} = $packages->{debug_URPM} = \&log::l;
+    $urpm::args::options{deploops} = $::o->{deploops};
+    $packages->{options}{'curl-options'} = $::o->{curl_options} if $::o->{curl_options};
 
     $packages;
 }
@@ -375,7 +464,7 @@ sub setSelectedFromCompssList {
     $rpmsrate_flags_chosen->{TRUE} = 1; #- ensure TRUE is set
     my $nb = selectedSize($packages);
 
-    my %pkgs = {};
+    my %pkgs;
     foreach my $p (@{$packages->{depslist}}) {
 	my @flags = $p->rflags;
 	next if
@@ -384,7 +473,7 @@ sub setSelectedFromCompssList {
 	$pkgs{$p->rate} ||= {};
 	$pkgs{$p->rate}{$p->id} = 1 if _packageRequest($packages, $p);
     }
-    my %pkgswanted = {};
+    my %pkgswanted;
     foreach my $level (sort { $b <=> $a } keys %pkgs) {
 	#- determine the packages that will be selected
 	#- the packages are not selected.
@@ -400,6 +489,7 @@ sub setSelectedFromCompssList {
 	    $nb += $_->size;
 	}
 	if ($max_size && $nb > $max_size) {
+	    log::l("disabling selected packages because too big for level $level: $nb > $max_size");
 	    $nb = $old_nb;
 	    $min_level = $level;
 	    $packages->disable_selected($packages->{rpmdb}, $state, @$l);
@@ -417,7 +507,7 @@ sub setSelectedFromCompssList {
 sub saveSelected {
     my ($packages) = @_;
     my $state = delete $packages->{state};
-    my @l = @{$packages->{depslist}};
+    my @l = @{$packages->{depslist} || []};
     my @flags = map { ($_->flag_requested && 1) + ($_->flag_required && 2) + ($_->flag_upgrade && 4) } @l;
     [ $packages, $state, \@l, \@flags ];
 }
@@ -508,7 +598,7 @@ sub computeGroupSize {
 		$newSelection{$id} = undef;
 
 		my $pkg = $packages->{depslist}[$id];
-		my @deps = map { [ $_, keys %{$packages->{provides}{$_} || {}} ] } $pkg->requires_nosense, $pkg->suggests;
+		my @deps = map { [ $_, keys %{$packages->{provides}{$_} || {}} ] } $pkg->requires_nosense, $pkg->recommends_nosense;
 		foreach (sort { @$a <=> @$b } @deps) { #- sort on number of provides (it helps choosing "b" in: "a" requires both "b" and virtual={"b","c"})
 		    my ($virtual, @choices) = @$_;
 		    if (@choices <= 1) {
@@ -520,7 +610,7 @@ sub computeGroupSize {
 			if (find { $_->flag_available } @choices_pkgs) {
 			    @choices = (); #- one package is already selected (?)
 			} else {
-			    @choices = map { $_->id } packageCallbackChoices($packages, undef, undef, \@choices_pkgs, $virtual);
+			    @choices = map { $_->id } packageCallbackChoices($packages, undef, undef, \@choices_pkgs, $virtual, undef);
 			}
 		    }
 		    push @l2, @choices;
@@ -555,6 +645,27 @@ sub _openInstallLog() {
     $LOG;
 }
 
+sub _rebuild_RPM_DB() {
+    if (my $pid = fork()) {
+	waitpid $pid, 0;
+	$? & 0xff00 and die "rebuilding of rpm database failed";
+    } else {
+	log::l("rebuilding rpm database");
+	my $rebuilddb_dir = "$::prefix/var/lib/rpmrebuilddb.$$";
+	if (-d $rebuilddb_dir) {
+	    log::l("removing stale directory $rebuilddb_dir");
+	    rm_rf($rebuilddb_dir);
+	}
+
+	if (!URPM::DB::rebuild($::prefix)) {
+	    log::l("rebuilding of rpm database failed: " . URPM::rpmErrorString());
+	    c::_exit(2);
+	}
+
+	c::_exit(0);
+    }
+}
+
 sub rpmDbOpen {
     my ($b_rebuild_if_needed) = @_;
 
@@ -562,26 +673,7 @@ sub rpmDbOpen {
 
     my $need_rebuild = $b_rebuild_if_needed && !URPM::DB::verify($::prefix);
 
-    if ($need_rebuild) {
-	if (my $pid = fork()) {
-	    waitpid $pid, 0;
-	    $? & 0xff00 and die "rebuilding of rpm database failed";
-	} else {
-	    log::l("rebuilding rpm database");
-	    my $rebuilddb_dir = "$::prefix/var/lib/rpmrebuilddb.$$";
-	    if (-d $rebuilddb_dir) {
-                log::l("removing stale directory $rebuilddb_dir");
-                rm_rf($rebuilddb_dir);
-            }
-
-	    if (!URPM::DB::rebuild($::prefix)) {
-                log::l("rebuilding of rpm database failed: " . URPM::rpmErrorString());
-                c::_exit(2);
-            }
-
-	    c::_exit(0);
-	}
-    }
+    _rebuild_RPM_DB() if $need_rebuild;
 
     my $db;
     if ($db = URPM::DB::open($::prefix)) {
@@ -703,6 +795,8 @@ sub install {
     log::l("install::pkgs::install the following: ", join(" ", map { $_->name } values %packages));
 
     URPM::read_config_files();
+    # force loading libnss*
+    getgrent();
     URPM::add_macro(join(' ', '__dbi_cdb', URPM::expand('%__dbi_cdb'), 'nofsync'));
     my $LOG = _openInstallLog();
 
@@ -715,7 +809,7 @@ sub install {
     #- place (install::steps_gtk.pm,...).
     $callback->($packages, user => undef, install => $nb, $total);
 
-    _install_raw($packages, $isUpgrade, $callback, $LOG, 0);
+    my $exit_code = _install_raw($packages, $isUpgrade, $callback, $LOG, 0);
 
     log::l("closing install.log file");
     close $LOG;
@@ -726,6 +820,8 @@ sub install {
     clean_rpmdb_shared_regions(); #- workaround librpm which is buggy when using librpm rooted and the just installed rooted library
 
     fs::loopback::save_boot($loop_boot);
+
+    $exit_code;
 }
 
 sub _unselect_package {
@@ -753,7 +849,7 @@ sub is_package_installed {
 }
 
 sub _install_raw {
-    my ($packages, $isUpgrade, $callback, $LOG, $noscripts) = @_;
+    my ($packages, $_isUpgrade, $callback, $LOG, $noscripts) = @_;
 
     # prevent warnings in install's logs:
     local $ENV{LC_ALL} = 'C';
@@ -764,11 +860,11 @@ sub _install_raw {
     # bug present in 2009.0, 2008.1, 2008.0, ... (probably since r11141 aka when switching to rpm-4.2 in URPM-0.83)
     local $packages->{options}{script_fd} = fileno $LOG;
 
-    my ($retry, $retry_count);
+    start_pushing_error();
 
     log::l("rpm transactions start");
 
-    my $exit_code = urpm::main_loop::run($packages, $packages->{state}, undef, undef, undef, {
+    my $exit_code = urpm::main_loop::run($packages, $packages->{state}, undef, undef, {
         open_helper => $callback,
         close_helper => sub {
 				my ($db, $packages, $_type, $id) = @_;
@@ -793,11 +889,15 @@ sub _install_raw {
             $msg =~ s/:$/\n\n/m; # FIXME: to be fixed in urpmi after 2008.0 (sic!)
             log::l($msg);
             log::l($msg2);
-            if ($packages->{options}{auto}) {
-                0;
-            } else {
-                $::o->ask_yesorno(N("Warning"), "$msg\n\n$msg2");
-            }
+            return 0 if $packages->{options}{auto};
+            state $do_not_ask;
+            state $answer;
+            return $answer if $do_not_ask;
+            $answer = $::o->ask_from_({ messages => "$msg\n\n$msg2" }, [ 
+                { val => \$do_not_ask,
+                  type => 'bool', text => N("Do not ask again"),
+              },
+            ]);
         },
         copy_removable => sub {
             my ($medium) = @_;
@@ -815,6 +915,11 @@ sub _install_raw {
                                  N("Installation of packages failed:") . "\n\n" . join("\n", @$errors));
             }
         },
+        completed => sub {
+            if (!$packages->{options}{auto}) {
+                popup_errors();
+            }
+        },
         message => sub {
             my ($title, $message) = @_;
             log::l($message);
@@ -825,6 +930,17 @@ sub _install_raw {
             log::l($msg);
             $::o->ask_yesorno($title, $msg);
         },
+        ask_for_bad_or_missing => sub {
+            my ($_title, $msg) = @_;
+            log::l($msg);
+            state $do_not_ask;
+            state $answer;
+            return $answer if $do_not_ask;
+            $answer = $::o->ask_from_({ messages => $msg }, [
+                { val => \$do_not_ask, type => 'bool', text => N("Do not ask again"),
+              },
+            ]);
+        },
         # Uneeded callbacks: success_summary
     });
           
@@ -949,7 +1065,7 @@ sub _remove_raw {
     URPM::add_macro(URPM::expand('__dbi_cdb %__dbi_cdb nofsync'));
 
     my $db = open_rpm_db_rw() or die "error opening RPM database: ", URPM::rpmErrorString();
-    my $trans = $db->create_transaction($::prefix);
+    my $trans = $db->create_transaction;
 
     #- stuff remove all packages that matches $p, not a problem since $p has name-version-release format.
     $trans->remove($_) foreach @$to_remove;
diff --git a/perl-install/install/share/aliases b/perl-install/install/share/aliases
index de852a835..f58e6b9ca 100644
--- a/perl-install/install/share/aliases
+++ b/perl-install/install/share/aliases
@@ -1,3 +1,5 @@
+/etc/ndiswrapper /mnt/etc/ndiswrapper
+/sbin/loadndisdriver /mnt/sbin/loadndisdriver
 /bin/gunzip gzip
 /usr/bin/install2 ../lib/libDrakX/install/install2
 /usr/bin/commands ../lib/libDrakX/install/commands
diff --git a/perl-install/install/share/gdb-inst b/perl-install/install/share/gdb-inst
new file mode 100644
index 000000000..8cd7d837e
--- /dev/null
+++ b/perl-install/install/share/gdb-inst
@@ -0,0 +1,24 @@
+#!/bin/sh
+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
+
+
+WARNING: that keyboard is in QWERTY mode!!!!
+
+EOF
+exec gdb -q --args perl /usr/bin/install2
diff --git a/perl-install/install/share/generate-xlocales b/perl-install/install/share/generate-xlocales
index 1bf60d549..60607af7b 100755
--- a/perl-install/install/share/generate-xlocales
+++ b/perl-install/install/share/generate-xlocales
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006 Mandriva
 #                         Pablo Saraxtaga <pablo@mandriva.com>
-#                         Thierry Vignaud <tvignaud@mandriva.com>
+#                         Thierry Vignaud <thierry.vignaud.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/perl-install/install/share/gtkrc b/perl-install/install/share/gtkrc
index ef6923a2c..6d4b2f48c 100644
--- a/perl-install/install/share/gtkrc
+++ b/perl-install/install/share/gtkrc
@@ -1 +1 @@
-gtk-theme-name = "Ia Ora Smooth"
+gtk-theme-name = "oxygen-gtk"
diff --git a/perl-install/install/share/kmap2bkmap b/perl-install/install/share/kmap2bkmap
index 8ac8f5846..9870ef3ef 100755
--- a/perl-install/install/share/kmap2bkmap
+++ b/perl-install/install/share/kmap2bkmap
@@ -8,10 +8,12 @@ my $KMAP_MAGIC = 0x8B39C07F;
 BEGIN { @ARGV == 1 or die "usage: kmap2bkmap <keymap>\n" }
 
 # load unicode keymap
-my $unimap = "$ARGV[0]" . ".uni";
+my $unimap = $ARGV[0] . ".uni";
 system("sudo loadkeys $unimap") == 0 or die;
-open F, "dumpkeys -n -f |";
-<F> =~ /^keymaps\s+(.*)/ or die;
+open my $F, "dumpkeys -n -f |";
+<$F> =~ /^keymaps\s+(.*)/ or die;
+
+my @keymaps;
 foreach (split ',', $1) {
     my @l = /(\d+)-(\d+)/;
     my ($i, $j) = @l ? @l : ($_,$_);
@@ -21,14 +23,15 @@ foreach (split ',', $1) {
 print pack("I", $KMAP_MAGIC);
 print map { pack "i", $keymaps[$_] || 0 } 0 .. c::MAX_NR_KEYMAPS()-1;
 
-foreach (<F>) {
+my @L;
+foreach (<$F>) {
     s/\+0x/0x/g;
     my ($keycode, $key, undef, @l) = split;
     $keycode eq 'keycode' or next;
     my $i = 0;
     $L[$i++][$key] = hex $_ foreach @l;
 }
-close F or die "dumpkeys failed";
+close $F or die "dumpkeys failed";
 
 foreach (@L) {
     foreach my $i (0 .. c::NR_KEYS()-1) {
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index b3cd021ea..cd79b8429 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -1,34 +1,32 @@
 <list no-arch-libraries="on">
 
 <from expand="binary">
-  ash echo
+  ash dash.static echo
   aria2c cp curl md5sum <!-- needed by urpmi -->
   cpio gzip bzip2
-  <if-not ARCH="ppc">
     fdisk
-  </if-not>
-  <if ARCH="ppc">
-    pdisk 
-  </if>
-  insmod modinfo rmmod
+  insmod modinfo rmmod modprobe lsmod
   losetup
-  lvm2 mdadm
+  lvm2 mdadm mdmon
   mount mount.nfs umount
+  xz
 
-  <mode copy="dereference">
-    usb_id <!-- needed by mouse::detect -->
-  </mode>
+  udevadm <!-- needed by mouse::detect & stage2 -->
 
   badblocks
-  mkswap
+  mkswap swaplabel
   mkfs.ext2 mkfs.ext3 mkfs.ext4 e2fsck tune2fs dumpe2fs resize2fs
 
   mkfs.reiserfs resize_reiserfs reiserfstune
   mkfs.xfs xfs_admin
+  xfs_freeze xfs_io <!-- needed for setup grub on XFS formated / -->
 
-  mkfs.btrfs btrfsctl
+  mkfs.btrfs btrfs btrfsck fsck.btrfs
+  mkfs.nilfs2 nilfs-tune
 
-  <if ARCH="i.86|x86_64|ia64">
+  tty stty <!-- needed for text mode installer (through unicode_start) -->
+
+  <if ARCH="i.86|x86_64">
     mkdosfs
     dosfslabel
     mlabel
@@ -36,6 +34,7 @@
     ntfsresize
     ntfslabel
     dmraid
+    kpartx
   </if>
   <if ARCH="i.86|x86_64">
     mkfs.jfs fsck.jfs jfs_tune
@@ -58,29 +57,72 @@
     unicode_start
   </filter>
 
-  <if ARCH="i.86|x86_64|ia64">
+  <if ARCH="i.86|x86_64">
     dmidecode 
   </if>
   <if ARCH="ia64">
   efibootmgr 
   </if>
 
-  <if ARCH="ppc">
-    hattrib hcopy hcd
-    hformat hmount humount 
-  </if>
-
   <if set="DEBUG_INSTALL">
-    strace bash less ps top gdb
+    strace bash less ps top gdb busybox
   </if>
 </from>
 
+<!-- when adding udev rules, think whether they're needed in rescue too
+     (../../../rescue/list.xml) -->
+<from dir="/lib/udev/rules.d">
+  10-dm.rules
+  11-dm-lvm.rules
+  13-dm-disk.rules
+  50-udev-default.rules <!-- needed for input in X11 -->
+  60-evdev.rules
+  60-persistent-input.rules
+  60-persistent-storage.rules
+  61-x11-input.rules
+  63-md-raid-arrays.rules
+  64-md-raid-assembly.rules
+  65-libwacom.rules
+  69-xorg-vmmouse.rules
+  75-net-description.rules
+  80-drivers.rules
+  80-libinput-device-groups.rules
+  80-net-setup-link.rules
+  90-libinput-model-quirks.rules
+  95-dm-notify.rules
+</from>
+
+<from dir="/usr/libexec">
+  Xorg
+  Xorg.wrap
+</from>
+
+<from dir="/usr/LIB/dri">
+  swrast_dri.so
+</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
-  extensions/libextmod.so
-  input/kbd_drv.so
-  input/mouse_drv.so
+  input/libinput_drv.so
   input/vmmouse_drv.so
   input/wacom_drv.so
   libfbdevhw.so
@@ -90,16 +132,32 @@
   libvbe.so
 </from>
 
+<from dir="/usr/share/X11/xorg.conf.d">
+  <from expand="glob">
+     *.conf
+  </from>
+</from>
+
+<from dir="/usr/share/glib-2.0/schemas">
+  <from expand="glob">
+    gschema*
+  </from>
+</from>
+
 <from dir="/usr/share/X11/xkb">
  <filter subst="s!//.*!!">
   geometry/pc
   keycodes/aliases
+  keycodes/evdev
   keycodes/xfree86
   rules/base
   rules/base.lst
+  <from expand="glob">
+     rules/evdev*
+  </from>
   rules/xorg
   rules/xorg.lst
-  compat semantics types
+  compat types
   <from expand="glob">
     symbols/*
   </from>
@@ -120,12 +178,28 @@
   </to>
 </from>
 
+<from dir="/usr/share/icons/Adwaita/">
+    index.theme
+    16x16/actions/go-down.png
+    16x16/actions/go-up.png
+    16x16/status/image-missing.png
+    scalable/actions/list-add-symbolic.svg
+    scalable/actions/list-remove-symbolic.svg
+    scalable/actions/pan-down-symbolic.svg
+    scalable/actions/pan-end-symbolic-rtl.svg
+    scalable/actions/pan-end-symbolic.svg
+    scalable/actions/pan-start-symbolic-rtl.svg
+    scalable/actions/pan-start-symbolic.svg
+    scalable/actions/pan-up-symbolic.svg
+</from>
+
 <from dir="/usr/share/locale">
   <to dir="/usr/share/locale_special">
     <from expand="glob">
       */LC_MESSAGES/draksnapshot.mo
       */LC_MESSAGES/drakx-net.mo
       */LC_MESSAGES/drakx-kbd-mouse-x11.mo
+      */LC_MESSAGES/gtk30.mo
       */LC_MESSAGES/urpmi.mo
     </from>
   </to>
@@ -144,10 +218,18 @@
   libnss_dns.so.2
   libresolv.so.2
   ld-linux*.so.2
+  <!-- needed for mount.ntfs-3g -->
+  libfuse.so.2
 
   <!-- modules used by libnss3 -->
   libfreebl3.so
   libsoftokn3.so
+
+  <!-- needed by dmraid -->
+  libdmraid-events-isw.so
+
+  <!-- needed fro Gtk3-WebKit -->
+  libwebkitgtk-3.0.so.0
 </from>
 </filter>
 
@@ -159,11 +241,10 @@
   /etc/passwd
   /etc/protocols
   /etc/rpm/macros.d/20common.macros
+
 <!--  /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/libia_ora.so
+  /usr/LIB/gtk-3.0/*/immodules/im-cedilla.so
   /usr/share/mime/mime.cache
 
   /usr/lib/libDrakX/keyboard.pm
@@ -172,10 +253,10 @@
   /usr/lib/libDrakX/Xconfig
   /usr/lib/libDrakX/auto/xf86misc
   /usr/lib/libDrakX/xf86misc
-  /usr/share/libDrakX/pixmaps
   <mode copy="keep-links">
-  <!--     /usr/share/doc/installer-help/ -->
+     /usr/share/doc/installer-help/
   </mode>
+  /usr/share/libDrakX/pixmaps
   /usr/lib/rpm/rpmrc
   /usr/lib/rpm/macros
   /usr/share/pci.ids
@@ -186,41 +267,82 @@
   /sbin/mount.ntfs-3g <!-- cannot be expanded as binary, not executable for all users -->
   /sbin/blkid
 
+  /sbin/mageia-setup-keyboard
+
   /usr/bin/drakx-matchbox-window-manager
   /usr/share/matchbox/mbnoapp.xpm
 
+  /usr/share/themes/Adwaita/gtk-3.0/gtk.css
+
   /etc/pki/tls/certs/ca-bundle.crt
 
-  /lib/udev/pcmcia-socket-startup
+  /usr/lib/systemd/systemd-udevd
+  /usr/lib/udev/ata_id
+  /usr/lib/udev/scsi_id
+  /usr/lib/udev/pcmcia-socket-startup
   /etc/pcmcia/config.opts
+  /bin/vmmouse_detect
 
-  <from expand="glob">
-    <from spaces_in_filename="1">
-       /usr/share/themes/Ia Ora*
-    </from>
-    <from spaces_in_filename="1">
-       /usr/share/themes/Ia Ora*/*
+  <!-- for GDB: -->
+  <if set="DEBUG_INSTALL">
+    /usr/include/python2.7/pyconfig.h
+    /usr/LIB/libinproctrace.so
+    /usr/LIB/libpython2.7.so.1.0
+    /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
+    /usr/LIB/python2.7/encodings/aliases.py
+    /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
+    /usr/LIB/python2.7/re.py
+    /usr/LIB/python2.7/site-packages/pygtk.pth
+    /usr/LIB/python2.7/site.py
+    /usr/LIB/python2.7/sre_compile.py
+    /usr/LIB/python2.7/sre_constants.py
+    /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
+    <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>
-    <from spaces_in_filename="1">
-       /usr/share/themes/Ia Ora*/gtk-2.0/gtkrc
-    </from>
     /usr/LIB/gdk-pixbuf-2.0/*/loaders.cache
-    /etc/gtk-2.0/gtk.immodules.*
+    /usr/LIB/gdk-pixbuf-2.0/*/loaders/libpixbufloader-png.so
+    /usr/LIB/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so
     /etc/brltty/*.ttb
-    /etc/brltty/brltty-??.hlp
+    /etc/brltty/*.txt
     /LIB/brltty/libbrlttyb??.so
   </from>
 
   <from expand="command">
     perl -Mlang -I.. -le 'print foreach lang::console_font_files()'
   </from>
-
-  <if set="DEBUG_INSTALL">
-    /etc/termcap
-  </if>
 </from>
 
 <from dir="/usr/share/ldetect-lst">
@@ -235,13 +357,10 @@
   ldetect-lst-modules.alias
 </from>
 
-<from dir="/usr/LIB/pango/*/modules">
-  pango-basic-fc.so
-  pango-arabic-fc.so
-  pango-hangul-fc.so
-  pango-hebrew-fc.so
-  pango-indic-fc.so
-  pango-thai-fc.so
+<from dir="/usr/LIB/device-mapper">
+  <from expand="glob"> 
+    *.so
+ </from>
 </from>
 
 <from dir="/usr/LIB/gconv">
@@ -271,19 +390,37 @@
   gconv-modules
 </from>
 
+<!-- For the usrmove -->
+<from>
+  /usr/lib/dracut/modules.d/30convertfs/convertfs.sh
+</from>
+<from expand="binary">
+  find bash ldconfig mv rm cp ln
+</from>
+
 <filter subst="/^__END__/ and $_ = '', close ARGV">
 <from expand="main-perl">
   AutoLoader.pm
-  Carp.pm
   Carp/Heavy.pm
-  Exporter.pm
+  Carp.pm
   Exporter/Heavy.pm
-  FileHandle.pm
+  Exporter.pm
   File/Basename.pm
   File/Find.pm
+  FileHandle.pm
   File/Path.pm
   File/Temp.pm
   Getopt/Long.pm
+  IPC/Open2.pm
+  IPC/Open3.pm
+  Net/Cmd.pm
+  Net/Config.pm
+  Net/FTP/A.pm
+  Net/FTP/dataconn.pm
+  Net/FTP/I.pm
+  Net/FTP.pm
+  Net/Netrc.pm
+  Net/Ping.pm
   PerlIO.pm
   SelectSaver.pm
   SelfLoader.pm
@@ -292,85 +429,81 @@
   Time/Local.pm
   XSLoader.pm
   base.pm
+  bytes_heavy.pl <!-- needed by urpm::mirrors -->
+  bytes.pm
   constant.pm
+  dumpvar.pl
   feature.pm
+  integer.pm
   locale.pm
-  utf8.pm
-  utf8_heavy.pl
+  overload.pm
+  overloading.pm
+  parent.pm
+  strict.pm
   unicore/Heavy.pl
-  unicore/To/Lower.pl
+  unicore/To/Digit.pl
   unicore/To/Fold.pl
+  unicore/To/Lower.pl
+  unicore/To/Uc.pl      <!-- needed for uc() on UTF-8 -->
   unicore/To/Upper.pl
-  dumpvar.pl
+  utf8_heavy.pl
+  utf8.pm
+  vars.pm
   warnings.pm
   warnings/register.pm
-  ARCH-linux-thread-multi/File/Glob.pm
-  ARCH-linux-thread-multi/auto/File/Glob/Glob.so
-  ARCH-linux-thread-multi/Config.pm
+  ARCH-linux-thread-multi/B.pm
   ARCH-linux-thread-multi/Config_git.pl
   ARCH-linux-thread-multi/Config_heavy.pl
+  ARCH-linux-thread-multi/Config.pm
+  ARCH-linux-thread-multi/Cwd.pm
   ARCH-linux-thread-multi/Data/Dumper.pm
   ARCH-linux-thread-multi/DynaLoader.pm
+  ARCH-linux-thread-multi/Encode.pm
+  ARCH-linux-thread-multi/Encode/Alias.pm
+  ARCH-linux-thread-multi/Encode/Config.pm
+  ARCH-linux-thread-multi/Encode/Encoding.pm
   ARCH-linux-thread-multi/Errno.pm
   ARCH-linux-thread-multi/Fcntl.pm
+  ARCH-linux-thread-multi/File/Glob.pm
   ARCH-linux-thread-multi/File/Spec.pm
   ARCH-linux-thread-multi/File/Spec/Unix.pm
-  ARCH-linux-thread-multi/auto/Fcntl/Fcntl.so
-  ARCH-linux-thread-multi/IO.pm
+  ARCH-linux-thread-multi/_h2ph_pre.ph
   ARCH-linux-thread-multi/IO/File.pm
   ARCH-linux-thread-multi/IO/Handle.pm
+  ARCH-linux-thread-multi/IO.pm
   ARCH-linux-thread-multi/IO/Seekable.pm
   ARCH-linux-thread-multi/IO/Select.pm
-  ARCH-linux-thread-multi/IO/Socket.pm
   ARCH-linux-thread-multi/IO/Socket/INET.pm
+  ARCH-linux-thread-multi/IO/Socket.pm
   ARCH-linux-thread-multi/IO/Socket/UNIX.pm
   ARCH-linux-thread-multi/List/Util.pm
-  ARCH-linux-thread-multi/Socket.pm
+  ARCH-linux-thread-multi/POSIX.pm
   ARCH-linux-thread-multi/Scalar/Util.pm
-  ARCH-linux-thread-multi/_h2ph_pre.ph
-  ARCH-linux-thread-multi/asm/unistd.ph
-  <if ARCH="ia64">
-  ARCH-linux-thread-multi/asm-i386/unistd.ph 
-  ARCH-linux-thread-multi/asm-x86_64/unistd.ph 
-  ARCH-linux-thread-multi/asm/break.ph 
-  </if>
+  ARCH-linux-thread-multi/Socket.pm
+  ARCH-linux-thread-multi/Time/HiRes.pm
   <if ARCH="i.86|x86_64">
   ARCH-linux-thread-multi/asm/unistd_32.ph
   ARCH-linux-thread-multi/asm/unistd_64.ph
   </if>
+  ARCH-linux-thread-multi/asm/unistd.ph
+  ARCH-linux-thread-multi/auto/B/B.so
+  ARCH-linux-thread-multi/auto/Cwd/Cwd.so
   ARCH-linux-thread-multi/auto/Data/Dumper/Dumper.so
+  ARCH-linux-thread-multi/auto/Encode/Encode.so
+  ARCH-linux-thread-multi/auto/Fcntl/Fcntl.so
+  ARCH-linux-thread-multi/auto/File/Glob/Glob.so
   ARCH-linux-thread-multi/auto/IO/IO.so
+  ARCH-linux-thread-multi/auto/List/Util/Util.so
+  ARCH-linux-thread-multi/auto/POSIX/POSIX.so
+  ARCH-linux-thread-multi/auto/re/re.so
   ARCH-linux-thread-multi/auto/Socket/Socket.so
+  ARCH-linux-thread-multi/auto/Time/HiRes/HiRes.so
   ARCH-linux-thread-multi/bits/syscall.ph
   ARCH-linux-thread-multi/bits/wordsize.ph
-  ARCH-linux-thread-multi/sys/syscall.ph
-  ARCH-linux-thread-multi/syscall.ph
-  ARCH-linux-thread-multi/auto/DynaLoader/dl_findfile.al
   ARCH-linux-thread-multi/lib.pm
   ARCH-linux-thread-multi/re.pm
-  ARCH-linux-thread-multi/auto/POSIX/autosplit.ix
-  ARCH-linux-thread-multi/auto/POSIX/load_imports.al
-  ARCH-linux-thread-multi/auto/POSIX/POSIX.so
-  ARCH-linux-thread-multi/Cwd.pm
-  ARCH-linux-thread-multi/auto/Cwd/Cwd.so
-  ARCH-linux-thread-multi/POSIX.pm
-  ARCH-linux-thread-multi/Time/HiRes.pm
-  ARCH-linux-thread-multi/auto/Time/HiRes/HiRes.so
-  bytes.pm
-  bytes_heavy.pl <!-- needed by urpm::mirrors -->
-  integer.pm
-  overload.pm
-  strict.pm
-  vars.pm
-  IPC/Open2.pm
-  IPC/Open3.pm
-  Net/Cmd.pm
-  Net/Config.pm
-  Net/FTP.pm
-  Net/FTP/A.pm
-  Net/FTP/I.pm
-  Net/FTP/dataconn.pm
-  Net/Netrc.pm
+  ARCH-linux-thread-multi/syscall.ph
+  ARCH-linux-thread-multi/sys/syscall.ph
   <if set="DEBUG_INSTALL">
     perl5db.pl
     Term/ReadLine.pm
@@ -378,15 +511,32 @@
 </from>
 
 <from expand="perl">
-  packdrake.pm
   Config/IniFiles.pm
-  MDV/Packdrakeng.pm
+  Exporter/Tiny.pm
   MDV/Distribconf.pm
+  MDV/Packdrakeng.pm
+  MDV/Snapshot/Common.pm
+  MDV/Snapshot/Restore.pm
+  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/List/MoreUtils/PP.pm
+  ARCH-linux-thread-multi/List/MoreUtils/XS.pm
   ARCH-linux-thread-multi/Term/ReadKey.pm
+  ARCH-linux-thread-multi/XML/LibXML.pm
+  ARCH-linux-thread-multi/XML/LibXML/AttributeHash.pm
+  ARCH-linux-thread-multi/XML/LibXML/Error.pm
+  ARCH-linux-thread-multi/XML/LibXML/NodeList.pm
+  ARCH-linux-thread-multi/XML/LibXML/Reader.pm
+  ARCH-linux-thread-multi/XML/LibXML/XPathContext.pm
+  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
-  MDV/Snapshot/Common.pm
-  MDV/Snapshot/Restore.pm
+  ARCH-linux-thread-multi/auto/XML/LibXML/LibXML.so
   urpm.pm
   urpm/args.pm
   urpm/cdrom.pm
@@ -406,6 +556,8 @@
   urpm/signature.pm
   urpm/util.pm
   urpm/sys.pm
+  urpm/xml_info.pm
+  urpm/xml_info_pkg.pm
   <if set="DEBUG_INSTALL">
     ARCH-linux-thread-multi/Term/ReadLine/Gnu.pm
     ARCH-linux-thread-multi/Term/ReadLine/Gnu/XS.pm
@@ -414,16 +566,22 @@
   </if>
 </from>
 
+<from expand="rpm" matching="m!/usr/lib/perl5/.*/unicore/lib!">
+  perl
+</from>
+
 <from expand="rpm" matching="m!^/usr/lib/perl5! and !/\.pod$/">
   perl-Curses
   perl-Curses-UI
   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
@@ -444,12 +602,12 @@
 <from dir="../../tools">
   <to dir="/usr/bin" flatten="on">
     serial_probe/serial_probe 
-    xhost+
   </to>
 </from>
 
 <from dir="../standalone">
   <to dir="/usr/bin">
+    display_installer_help
     display_release_notes.pl
   </to>
 </from>
@@ -463,6 +621,14 @@
     consolefonts symlinks
     upgrade
   </to>
+
+  <!-- for gtk+3 that needs dbus to be initialized -->
+  <to dir="/etc">
+    <!-- abusing '<from expand="command">' -->
+    <from expand="command">
+      dbus-uuidgen > share/machine-id; echo machine-id
+    </from>
+  </to>
 </from>
 
 <from dir="../pixmaps">
@@ -481,13 +647,6 @@
   </to>
 </from>
 
-<from dir="share">
-  <to dir="/etc/gtk-2.0/">
-    gtkrc
-  </to>
-</from>
-
-
 <from dir="pixmaps">
   <to dir="/usr/share">
     <from expand="glob">
diff --git a/perl-install/install/share/po/.gitignore b/perl-install/install/share/po/.gitignore
new file mode 100644
index 000000000..cd1f2c943
--- /dev/null
+++ b/perl-install/install/share/po/.gitignore
@@ -0,0 +1 @@
+*.mo
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 796884c6e..7f5617f7a 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: 2011-04-01 20:08+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+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"
@@ -18,19 +18,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../advertising/01_IM_mageia.pl:1 ../../advertising/02_IM_mageia.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
 #: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Mageia, the new Linux distribution"
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, c-format
+msgid "Office tools"
+msgstr ""
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
 msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -39,110 +83,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr ""
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr ""
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr ""
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
 msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
 msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr ""
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -151,87 +262,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr ""
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr ""
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr ""
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr ""
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr ""
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr ""
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr ""
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr ""
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr ""
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr ""
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr ""
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr ""
@@ -253,22 +364,22 @@ msgstr ""
 msgid "Bringing down the network"
 msgstr ""
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:715
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:755
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:808
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr ""
@@ -298,340 +409,422 @@ msgstr ""
 msgid "maybe"
 msgstr ""
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr ""
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr ""
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"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:26
 #, c-format
 msgid "Game station"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, 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:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
+msgid "PostgreSQL and MariaDB Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
+msgid "PostgreSQL or MariaDB database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, 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:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, c-format
 msgid "Utilities"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr ""
@@ -643,7 +836,7 @@ msgid ""
 "Continue at your own risk."
 msgstr ""
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -667,12 +860,12 @@ msgstr ""
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr ""
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -680,304 +873,304 @@ msgid ""
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr ""
+
+#: steps_gtk.pm:253
 #, c-format
 msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
 msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr ""
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr ""
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr ""
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
+msgid "Unselect All"
 msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
+msgid "Total size: %d / %d MB"
 msgstr ""
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr ""
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr ""
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr ""
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr ""
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr ""
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr ""
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr ""
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr ""
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr ""
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr ""
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr ""
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr ""
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr ""
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr ""
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr ""
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr ""
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr ""
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr ""
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr ""
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr ""
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr ""
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr ""
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr ""
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr ""
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr ""
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr ""
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr ""
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr ""
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
 "Installer has detected that your installed Linux system could not\n"
@@ -989,32 +1182,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr ""
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1023,158 +1201,182 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr ""
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr ""
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr ""
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr ""
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr ""
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr ""
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr ""
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr ""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr ""
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr ""
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr ""
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr ""
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1187,121 +1389,114 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr ""
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr ""
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr ""
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr ""
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr ""
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr ""
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr ""
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr ""
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr ""
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr ""
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
+msgid "Preparing initial startup program..."
 msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1309,12 +1504,12 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr ""
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr ""
@@ -1409,13 +1604,6 @@ msgid ""
 "Users"
 msgstr ""
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr ""
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
diff --git a/perl-install/install/share/po/Makefile b/perl-install/install/share/po/Makefile
index 4885b1840..7d444738d 100644
--- a/perl-install/install/share/po/Makefile
+++ b/perl-install/install/share/po/Makefile
@@ -1,6 +1,7 @@
 NAME = DrakX
 LOCALEDIR = ${prefix}/share/locale
-PMSFILES = *.pm share/meta-task/compssUsers.pl*  ../../advertising/*.pl
+METATASK = share/meta-task/compssUsers.pl
+PMSFILES = *.pm $(METATASK) ../../advertising/*.pl
 PMSFILES_HERE = $(wildcard $(PMSFILES:%=../../%))
 
 MAIN_PO_FILES = ../../../share/po/libDrakX.pot
@@ -16,14 +17,18 @@ default: $(MOFILES)
 
 update_n_merge: $(NAME).pot merge
 
-merge:
+merge: $(NAME).pot
 	for n in $(POFILES); do \
 	  echo "Merging $$n"; \
 	  msgmerge $$n $(NAME).pot > "$$n"t ; \
 	  mv -f "$$n"t $$n ; \
 	done
 
-$(NAME).pot: $(PMSFILES_HERE)
+../../$(METATASK):
+	mkdir -p ../../share/meta-task
+	svn cat svn://svn.mageia.org/svn/packages/cauldron/meta-task/current/SOURCES/compssUsers.pl > $@
+
+$(NAME).pot: $(PMSFILES_HERE) ../../$(METATASK)
 	cd ../.. ; perl_checker -q --generate-pot share/po/.$@ $(PMSFILES)
 	xgettext $(MAIN_PO_FILES:%=-x %) -o $@ .$@
 	rm -f .$@
@@ -35,4 +40,5 @@ install: $(MOFILES)
 	done
 
 clean:
-	@rm -rf *.mo $(POFILES:%=%t)
+	@rm -rf *.mo $(POFILES:%=%t) ../../$(METATASK)
+	@rmdir ../../share/meta-task
diff --git a/perl-install/install/share/po/af.po b/perl-install/install/share/po/af.po
index 8ae4c9962..39aab5a03 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: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+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"
@@ -22,38 +22,63 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Kantoorwerkstasie"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "For developers!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Thank you!"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, fuzzy, c-format
 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:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -62,112 +87,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CDROM"
 
-#: any.pm:121
+#: any.pm:163
 #, fuzzy, c-format
 msgid "Network (HTTP)"
 msgstr "Netwerk %s"
 
-#: any.pm:122
+#: any.pm:164
 #, fuzzy, c-format
 msgid "Network (FTP)"
 msgstr "Netwerk %s"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "Kontak Mageia Linux se webwerf vir 'n lys van spieëlwebplekke...."
+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:187
+#: any.pm:253
 #, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr "Kontak Mageia Linux se webwerf vir 'n lys van spieëlwebplekke...."
+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:197
+#: any.pm:263
 #, 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:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Gids"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, 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:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ondersoek pakette wat reeds geïnstalleer is..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Soek vir pakkette om op te gradeer..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -180,88 +270,88 @@ msgstr ""
 "\n"
 "Wil u werklik dat ons hulle verwyder?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fout met die lees van lêer %s"
 
 #
-#: any.pm:1020
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Die volgende pakkette geïnstalleer word:\n"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "Ftp"
 
-#: any.pm:1079
+#: any.pm:1363
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "PFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Netwerk"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Kies asseblief"
 
-#: any.pm:1118
+#: any.pm:1402
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Lêer bestaan alreeds. Moet dit gebruik word?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Toegang verbied"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr ""
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Kan nie skermfoto's neem voor partisie skep nie"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skermfoto's sal na die installasie beskikbaar wees in %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "Besig met installasie"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurasie"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "U moet ook %s formatteer"
@@ -285,22 +375,22 @@ msgstr "Netwerk op pad op"
 msgid "Bringing down the network"
 msgstr "Netwerk op pad af"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Bespeuring aan die gebeur"
@@ -330,73 +420,98 @@ msgstr "oulik"
 msgid "maybe"
 msgstr "moontlik"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr ""
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "'n Fout het voorgekom"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "'n Ernstige fout het voorgekom: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "onsuksesvolle installasie"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Installeer pakket %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Werkstasie"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Kantoorwerkstasie"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Kantoorprogramme: Woordverwerkers(OpenOffice.org Writer, Kword), spreistate "
-"(OpenOffice.org Calc, Kspread), PDF-sigprogramme, ens."
+"Kantoorprogramme: Woordverwerkers(LibreOffice Writer, Kword), spreistate "
+"(LibreOffice Calc, Kspread), PDF-sigprogramme, ens."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Speletjiesrekenaar"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, 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:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediastasie"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, 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:36
 #, c-format
 msgid "Internet station"
 msgstr "Internetstasie"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -405,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:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Netwerkrekenaar (kliënt)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, 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:49
 #, 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:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsole Hulpprogramme"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Ontwikkeling"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentasie"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, 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:79
 #, c-format
 msgid "Web Server"
 msgstr "Web-bediener"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "Groep:"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internetpoort"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Lêer/_Nuut"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, 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:97
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Herstel vanaf CD"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-bediener"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, 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:112
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Drukkerbediener"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Databasis"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, fuzzy, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL of MySQL databasisbediener"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL of MariaDB databasisbediener"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "e-Pos"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix e-pos-bediener"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL of MySQL databasisbediener"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL of MariaDB databasisbediener"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Netwerkrekenaar-bediener"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafiese Omgewing"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE Werkstasie"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -602,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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-werkstasie"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -616,66 +731,129 @@ msgstr ""
 "'n Grafiese omgewing met  gebruikersvriendelike stel applikasies en "
 "werkskerm-hulpprogramme"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE Werkstasie"
+
+#: share/meta-task/compssUsers.pl:165
+#, 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:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME-werkstasie"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Werkstasie"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Grafiese Omgewing"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "'n Werkstasie"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, 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:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "'n Werkstasie"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "'n Grafiese omgewing met  gebruikersvriendelike stel applikasies en "
 "werkskerm-hulpprogramme"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "'n Werkstasie"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"Die K-werkskermomgewing (KDE), die basiese grafiese omgewing met 'n "
+"versameling bygaande hulpprogramme"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Ander Grafiese Werkskerms"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, c-format
 msgid "Utilities"
 msgstr "Nutsprogramme"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-bediener"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Webkamera"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Terminal Server Konfigurasie"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Monitor van Netwerk"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "<b>Mageia Store</b>"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Probleme met die konfigurasie van drukker \" %s\"!"
@@ -689,7 +867,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:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -709,336 +887,336 @@ msgstr "Gaan stap '%s' binne\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux Installasie %s"
+msgid "%s Installation %s"
+msgstr "%s Installasie %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> tussen elemente"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "U stelsel het min hulpbronne beskikbaar. U mag dalk probleme\n"
 "ondervind met die installering\n"
-"van Mageia Linux. In so 'n geval probeer eerder die teksinstallasie.\n"
+"van %s. In so 'n geval probeer eerder die teksinstallasie.\n"
 "Daarvoor moet u\n"
 "'F1' druk wanneer u vanaf die CDROM herlaai en dan 'text' op die\n"
 "instruksielyn intik."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Kies Pakketgroepe"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Minimale installasie"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "'n Werkstasie"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "'n Werkstasie"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "'n Werkstasie"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Kies Pakketgroepe"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuele pakket-seleksie"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Totale grootte: %d / %d MB"
+msgid "Unselect All"
+msgstr "Herstel Keuses"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Foutiewe pakket"
+msgid "Total size: %d / %d MB"
+msgstr "Totale grootte: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Weergawe: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Grootte: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Belangrikheid: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "U kan nie hierdie pakket selekteer/deselekteer nie"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "deur %s wat soek is"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "deur problematiese %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "probeer promosie van %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "om %s te kan behou"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "U kan nie hierdie pakket selekteer nie, omdat daar nie meer spasie "
 "beskikbaar is nie"
 
-#: steps_gtk.pm:456
+#: 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:457
+#: 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:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+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:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+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:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+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:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Wys outogeselekteerde pakkette."
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Installasie"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "Pakketkeuse"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Pakketseleksie word opgedateer"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimale installasie"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Sagteware Beheer"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Kies die pakkette wat u wil installeer"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Besig met installasie"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Geen Detail"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Tyd oor "
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Skatting"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakket"
 msgstr[1] "%d pakkette"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Opsomming"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Konfigureer"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "nie gekonfigureer nie"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Kies Pakketgroepe"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "'n Fout het voorgekom"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Kies asseblief u sleutelborduitleg"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Hier is die volle lys van beskikbare lande"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installeer/Opgradeer"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Is hierdie 'n installasie of opgradering?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installasie"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Opgradeer %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Enkripsie-sleutel vir %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Besig met installasie"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1047,38 +1225,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE word opgestel"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Geen beskikbare 1MB herlaaipartisie nie! Installasie sal voortgaan, maar u "
-"sal  herlaaipartisie met DiskDrake moet skep indien u die stelsel wil "
-"herlaai."
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Geen beskikbare 1MB herlaaipartisie nie! Installasie sal voortgaan, maar u "
-"sal  herlaaipartisie met DiskDrake moet skep indien u die stelsel wil "
-"herlaai."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1092,19 +1249,19 @@ msgstr ""
 "nie\n"
 "hieroor beskik nie, druk Kanselleer om installasies vanaf dié CDROM te vermy."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Soek vir beskikbare pakkette"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1113,52 +1270,52 @@ msgstr ""
 "Kies asb. die laai of stoor pakketkeuse op die floppie.\n"
 "Die formaat is dieselfde as outoinstallasie-genereerde floppies."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Las"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Stoor"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Laai lêer"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Kies Pakketgroepe"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Geselekteerde grootte is groter as beskikbare spasie."
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipe installasie"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1167,87 +1324,111 @@ msgstr ""
 "U het glad nie 'n groep pakkette gekies nie.\n"
 "Kies asseblief die tipe minimale installasie:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Met X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Installeer pakket %s"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Met basiese dokumentasie (word aanbeveel!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Absolute minimale installasie (geen urpmi!)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Herlaaistelsel word voorberei..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Berei installasie voor"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Installeer pakket %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Daar was 'n fout met pakkette:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Gaan steeds voort?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Herstel"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Stoor pakketseleksie"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Daar was 'n fout met die installasie van die pakkette:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Post-installasiekonfigurasie"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr ""
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1267,109 +1448,98 @@ msgstr ""
 "\n"
 "Wil u dit nou installeer?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s op %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardeware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Klankkaart"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Beskik u oor 'n ISA klankkaart?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, 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:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Geen klankkaart opgespoor nie. Probeer \"harddrake\" na die installasie"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafiese-koppelvlak"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Netwerk & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Instaan bedieners"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "gekonfigureer"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Sekuriteitsvlak"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Vuurmuur"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "ge-aktiveer"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "ge-deaktiveer"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, 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:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Herlaaistelsel word voorberei..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Berei installasie voor"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, fuzzy, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Dit wil voorkom of u 'n 'OldWorld' of Onbekende\n"
-"rekenaar het, die yaboot herlaaistelsel sal nie hier werk nie.\n"
-"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:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1378,17 +1548,17 @@ msgstr ""
 "Met hierdie sekuriteitsvlak word toegang na lêers op die Windows partisie "
 "vernou na slegs die administrateur"
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sit 'n leë floppie in aandrywer %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Outoinstallasieskyf word geskep."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1399,12 +1569,12 @@ msgstr ""
 "\n"
 "Wil u werklik nou eindig?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Geluk"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Herlaai"
@@ -1499,13 +1669,6 @@ msgid ""
 "Users"
 msgstr "Gebruikers"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Netwerk"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1548,6 +1711,69 @@ msgid ""
 "Exit"
 msgstr "Verlaat"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Herlaaistelsel word voorberei..."
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "'n Grafiese omgewing met  gebruikersvriendelike stel applikasies en "
+#~ "werkskerm-hulpprogramme"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "'n Werkstasie"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "Geen beskikbare 1MB herlaaipartisie nie! Installasie sal voortgaan, maar "
+#~ "u sal  herlaaipartisie met DiskDrake moet skep indien u die stelsel wil "
+#~ "herlaai."
+
+#, fuzzy
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "Geen beskikbare 1MB herlaaipartisie nie! Installasie sal voortgaan, maar "
+#~ "u sal  herlaaipartisie met DiskDrake moet skep indien u die stelsel wil "
+#~ "herlaai."
+
+#, fuzzy
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Dit wil voorkom of u 'n 'OldWorld' of Onbekende\n"
+#~ "rekenaar het, die yaboot herlaaistelsel sal nie hier werk nie.\n"
+#~ "Ons sal voortgaan met die installasie, maar u sal\n"
+#~ "BootX of 'n ander manier moet gedruik om u rekenaar te selflaai"
+
+#~ msgid "Welcome"
+#~ msgstr "Welkom"
+
+#~ msgid "Select All"
+#~ msgstr "Kies almal"
+
+#~ msgid "Bad package"
+#~ msgstr "Foutiewe pakket"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Herlaaistelsel word voorberei..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Netwerk"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1598,7 +1824,7 @@ msgstr "Verlaat"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/am.po b/perl-install/install/share/po/am.po
index d53638e93..e44b830a4 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: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+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"
@@ -15,38 +15,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
 msgstr "ሌላ አለ?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -55,112 +80,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "ሲዲ-ሮ�"
 
-#: any.pm:121
+#: any.pm:163
 #, fuzzy, c-format
 msgid "Network (HTTP)"
 msgstr "መረብ"
 
-#: any.pm:122
+#: any.pm:164
 #, fuzzy, c-format
 msgid "Network (FTP)"
 msgstr "መረብ"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "ዶሴ"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "መረጃ በ%s መጠቀሚያ �ሮ�ራ� ላይ"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -169,87 +259,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "%sን በማንበብ ላይ ስህተት ተ�ጥሯ�"
 
-#: any.pm:1020
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "የሚከተሉት ጥቅሎች ሊወገዱ ��"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "መረብ"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "እባክዎ ያለ ሰ�ድን ይ�ረጡ"
 
-#: any.pm:1118
+#: any.pm:1402
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "�ይሉ በ�ት� �በር� �ጠቀ�በት?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "�ቃድ አ�ተሰጠ�"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "�ይ� ተጭኗ� %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr ""
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "በመትከ� ላይ"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "ስየማ"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr ""
@@ -271,22 +361,22 @@ msgstr "መረቡን በማቀራረብ ላይ"
 msgid "Bringing down the network"
 msgstr "መረቡን በማለያየት ላይ"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "የተሻሻለ ዊድጌት �ጠር"
@@ -316,340 +406,422 @@ msgstr "ጥሩ"
 msgid "maybe"
 msgstr "�ና�ባት"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, fuzzy, c-format
+msgid "No description"
+msgstr "መ�ለጫ"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "ስህተት ተ�ጥሯ�"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "%s አ�ተገኘ�"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "የ%s ጥቅ� በመትከ� ላይ"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "የቅርብ መረብ �ርጫ"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"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:26
 #, c-format
 msgid "Game station"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "የመገናኛ ብዙሃን"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "�ጣን መ�እክት"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, 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:42
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "ኮ���ተር ሳይንስ"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, fuzzy, c-format
 msgid "Console Tools"
 msgstr "የ�ይ� መሳሪያዎች"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "እድገት"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "ማስረጃ"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "የመረብ ሰርቨር"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, fuzzy, c-format
 msgid "Apache"
 msgstr "መተላለ�ያ"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "የ�ይይት መድረክ"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Kolab Server"
 msgstr "የሳ�ባ ተጠሪ"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "አዲስ �ይ��"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "የመ�ዕክት ተጠሪ ሚስጢራዊ ቃ� ያስ��ጋ�"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "በ�ር�ር �ስጥ ዶሴ ጨ�ር"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "የFTP ተጠሪ"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "የዘር� ስ� ሰርቨር"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "የማተሚያ ሰርቨር"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "ዳታቤ�"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
+msgid "PostgreSQL and MariaDB Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "�ስታ"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
+msgid "PostgreSQL or MariaDB database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "ኮ���ተር ሳይንስ"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, 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:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "የቅርብ መረብ �ርጫ"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "የቅርብ መረብ �ርጫ"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "የቅርብ መረብ �ርጫ"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "ሰሌዳ"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "ሰሌዳ"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "ሰሌዳ"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, fuzzy, c-format
 msgid "Utilities"
 msgstr "�ሊ�ንስ"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "ስለተጠሪ መረጃ"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "ዌብ-ካ�"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "ቀዳሚ ተጠሪ ይጠቀ�"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Name=መረብ"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
-msgstr "<b>የMageia Linux ባለሞያ</b>"
+msgstr "<b>የMageia ባለሞያ</b>"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "የባሕር-መ�ገብ እሴት '%s' ወደ '%s' እንደገና መሰየ� አ�ተቻለ��"
@@ -661,7 +833,7 @@ msgid ""
 "Continue at your own risk."
 msgstr ""
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -677,328 +849,328 @@ msgstr ""
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "የMageia Linux ተከላ %s"
+msgid "%s Installation %s"
+msgstr "የ%s ተከላ %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr ""
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "የጥቅ� ቡድን �ርጫ"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "አ�ስተኛ ተከላ"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "ሰሌዳ"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "ሰሌዳ"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "ሰሌዳ"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "የጥቅ� ቡድን �ርጫ"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "የ�ጠላ ጥቅ� �ርጫ"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
+#, fuzzy, c-format
+msgid "Unselect All"
+msgstr "�ሉን� &ተዉት"
+
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "አጠቃላይ መጠን: %d / %d MB"
 
-#: steps_gtk.pm:403
-#, c-format
-msgid "Bad package"
-msgstr "ትክክ� ያ�ሆ� ጥቅ�"
-
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "�ርያ: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "መጠን: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "አስ�ላጊ�ት: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "ይህን ጥቅ� መ�ረጥ/አለመ�ረጥ አይችሉ�"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s ባለመገኘቱ �ክንያት"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s አጥጋቢ ባለመሆኑ �ክንያት"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%sን ለማስተዋወቅ በመሞከር ላይ"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%sን ለማቆየት"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "የሚከተሉት ጥቅሎች ሊተከሉ ��"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "የሚከተሉት ጥቅሎች ሊወገዱ ��"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr ""
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "ይህንን ጥቅ� መ�ረጥ አይችሉ�� ቀደ� ብሎ ተተክ���"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr ""
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "ትከ�"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "የጥቅ� �ርጫ"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "የጥቅ� �ርጫ በማሻሻ� ላይ"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "አ�ስተኛ ተከላ"
 
-#: steps_gtk.pm:518
-#, c-format
+#: steps_gtk.pm:534
+#, fuzzy, c-format
 msgid "Software Management"
-msgstr ""
+msgstr "ማ�ጫዎች &አስተዳዳሪ"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "ለመትከ� የሚ��ጉትን ጥቅ� ይ�ረጡ"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "በመትከ� ላይ"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "ያለ �ር�ሮች"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr " ይቀራ�"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "በ��ት"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d ጥቅሎች"
 msgstr[1] "%d ጥቅሎች"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "ማጠቃለያ"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "ለ�ጥ"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "አ�ተስተካከለ�"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "የጥቅ� ቡድን �ርጫ"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "ስህተት ተ�ጥሯ�"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr ""
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "ትከ�/አሳድ�"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "ትከ�"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "የ%s ሚስጢራዊ መገ�በጫ ���"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "በመትከ� ላይ"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1007,32 +1179,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDEን በማስተካከ� ላይ"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1041,158 +1198,182 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr ""
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "ጫን"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "አስቀ�ጥ"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "1 �ይ�"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "ኖ�"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "የጥቅ� ቡድን �ርጫ"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "የተከላ� አይ�ት"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "በX"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "የ%s ጥቅ� በመትከ� ላይ"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "አስጀማሪ በማዘጋጀት ላይ..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "ተከላ በማዘጋጀት ላይ"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "የ%s ጥቅ� በመትከ� ላይ"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "ለማንኛ�� ቀጥ�?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "ወደ መጀመሪያ� መ�ስ"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "የጥቅሎችን �ርጫ አስቀ�ጥ"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "የ%s ጥቅ� በመትከ� ላይ"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Post-install configuration"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "አሻሻዎች"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1205,121 +1386,114 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s %s ላይ ��"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "ሀርድዌር"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "የድ�� ካርድ"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "የISA ድ�ጽ ካርድ አለዎት?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "ንድ�ዊ እይታ"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "መረብ እና ኢንተርኔት"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "ወኪሎች"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "ተስተካክ��"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "የደህን�ት ደረጃ"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "የእሳት �ድ�ዳ"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "መስራት ጀ�ሯ�"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "መስራት አ�ሟ�"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "አስጀማሪ በማዘጋጀት ላይ..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "ተከላ በማዘጋጀት ላይ"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1327,12 +1501,12 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "እንኳን ደስ ያለዎ!"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "እንደገና ጀ�ር"
@@ -1427,13 +1601,6 @@ msgid ""
 "Users"
 msgstr "ተጠቃሚዎች"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "መረብ"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1476,6 +1643,32 @@ msgid ""
 "Exit"
 msgstr "�ጣ"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "አስጀማሪ በማዘጋጀት ላይ..."
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "ሰሌዳ"
+
+#~ msgid "Welcome"
+#~ msgstr "እንኳን ደህና መጡ"
+
+#, fuzzy
+#~ msgid "Select All"
+#~ msgstr "�ሉን� &ተዉት"
+
+#~ msgid "Bad package"
+#~ msgstr "ትክክ� ያ�ሆ� ጥቅ�"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "አስጀማሪ በማዘጋጀት ላይ..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "መረብ"
+
 #, fuzzy
 #~ msgid "Downloading file %s..."
 #~ msgstr "የቅርብ ጊዜ �ይሎች"
diff --git a/perl-install/install/share/po/ar.po b/perl-install/install/share/po/ar.po
index 619c4aa0e..eea6702e3 100644
--- a/perl-install/install/share/po/ar.po
+++ b/perl-install/install/share/po/ar.po
@@ -1,60 +1,80 @@
-# translation of DrakX.po to
-# Amr Fathy <amr10@menanet.net>, 2001.
-# Mohammed Gamal <f2c2001@yahoo.com>, 2002.
-# Youcef Rabah Rahal <rahal@arabeyes.org>, 2004.
-# Ossama M. Khayat <okhayat@yahoo.com>, 2004, 2005.
-# Munzir Taha <munzir@kacst.edu.sa>, 2004.
-# Abdulaziz Al-Arfaj <alarfaj@arabeyes.org>, 2005.
-# Yaser Ammar <linux.uae@gawab.com>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: drakx_install\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-03-25 19:22+0400\n"
-"Last-Translator: Yaser Ammar <linux.uae@gawab.com>\n"
-"Language-Team:  Arabic <doc@arabeyes.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+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"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "سطح مكتبك على وحدة USB"
+msgid "Join Us!"
+msgstr "انضم إلينا!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "توزيعة لينكس ماندري�ا م�توحة المصدر 100%%"
+msgid "Make it yours!"
+msgstr "لتكن ملكك!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "اكتش� لينكس بسهولة مع ماندري�ا ون"
+msgid "Your choice!"
+msgstr "اختيارك!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "سطح مكتب لينكس ماندري�ا كامل مع الدعم"
+msgid "Office tools"
+msgstr "أدوات مكتبية"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "ماندري�ا: توزيعات تلبي احتياجات الجميع"
+msgid "Home entertainment"
+msgstr "التر�يه المنزلي"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "للأط�ال"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "للعائلة!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "للمطورين!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "شكرا لك!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "كن حراً!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr "هل لديك وسائط إضا�يّة أخرى؟"
+msgstr "هل لديك وسائط إضا�ية أخرى؟"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -62,118 +82,188 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
-"لقد و�جدت الوسائط التالية وستستخدم خلال التثبيت: %s.\n"
+"لقد تم العثور على الوسائط التالية وستستخدم خلال التثبيت: %s.\n"
 "\n"
 "\n"
-"هل لديك وسيط تثبيت إضا�ي لضبطه ؟"
+"هل لديك وسيط تثبيت إضا�ي لضبطه؟"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "القرص المدمج"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "الشبكة (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "الشبكة (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "الشبكة (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "مسار المرآة؟"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "يجب أن يبدأ المسار بـ http:// أو بـ ftp://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"يجري الاتصال بموقع لينكس ماندري�ا للحصول على قائمة بالمرايا المتو�رة..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "جاري الاتصال بموقع %s للحصول على قائمة بالمرايا المتو�رة..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr "�شل الاتصال بموقع لينكس ماندري�ا للحصول على قائمة بالمرايا المتو�رة"
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr "�شل الاتصال بموقع %s للحصول على قائمة بالمرايا المتو�رة"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "اختر مرآة لتحصيل الحزم"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "تثبيت NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "�ضلا أدخل اسم المضي� والدليل لوسائط NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "اسم المضي� غير موجود"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "يجب أن يبدأ الدليل بـ \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "اسم مضي� نقطة وصل NFS ؟"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "الدليل"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "إضا�ي"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "لم يمكن العثور على مل� لائحة الحزم على هذه المرآة. تأكد من صحة الموقع."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "مخزن Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "مخزن Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "مخزن Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"بعض قطع العتاد �ي جهازك تحتاج بعض المكتبات الغير حرة لتتمكن التعاري� الحرة "
+"من العمل."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "يجب أن ت�عل \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" يحتوي على مختل� مكونات النظام وتطبيقاته"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" يحتوي على برمجيات غير حرة. \n"
+
+#: any.pm:477
+#, 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، ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\"  يحتوى على برمجيات لا يمكن إعادة نشرها �ي جميع بقاع العالم بسبب "
+"براءات الاختراع.  "
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "يحتوي أيضا على برمجيات من \"%s\" تم إعادة بنائها بإمكانيات إضا�ية."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "هنا يمكنك ت�عيل وسائط أكثر إن أردت."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "هذا الوسيط يو�ر تحديثات للبرمجيات للوسيط \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
-msgstr "التعر� على الحزم المثبتة مسبقاً..."
+msgstr "جاري البحث عن الحزم المثبتة مسبقا..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
-msgstr "البحث عن حزم لترقيتها..."
+msgstr "جاري العثور على الحزم التي يمكن ترقيتها... "
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
-msgstr "إزالة الحزم قبيل ترقيتها"
+msgstr "جاري إزالة الحزم قبيل ترقيتها"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -184,89 +274,89 @@ msgstr ""
 "ستحذ� هذه الحزم للسماح بترقية النظام: %s\n"
 "\n"
 "\n"
-"هل تريد حذ� هذه الحزم �علاً؟\n"
+"هل تريد حذ� هذه الحزم �علا؟\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "خطأ �ي قراءة المل� %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "لقد غ�يّرت أسماء الأقراص التّالية:"
+msgstr "لقد تم تغيير أسماء الأقراص التالية:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
-msgstr "%s (المسمّى %s سابقاً)"
+msgstr "%s (المسمى %s سابقاً)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "الشبكة"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
-msgstr "�ضلا.. اختر أحد الوسائط"
+msgstr "الرجاء اختيار وسيط"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "المل� موجود مسبقاً. هل تريد الكتابة عليه؟"
+msgstr "المل� موجود مسبقا. هل تريد استبداله؟"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
-msgstr "الإذن مر�وض"
+msgstr "تم ر�ض الإذن"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "اسم NFS غير صالح"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "الوسيط %s سيء"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "لا يمكن عمل لقطات للشاشة قبل التجزئة"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "ستكون لقطات الشاشة موجودة بعد التثبيت �ي %s"
+msgstr " لقطات الشاشة ستكون متو�رة بعد التثبيت �ي %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "التثبيت"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "الضبط"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "عليك أيضا تهيئة %s"
@@ -277,43 +367,43 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"بعض العتاد الموجود على جهازك يحتاج إلى مشغلات ``مملوكة'' كي يعمل.\n"
+"بعض العتاد على جهازك يحتاج إلى مشغلات ``مملوكة'' كي يعمل.\n"
 "يمكنك إيجاد مزيد من المعلومات عنها �ي: %s"
 
 #: interactive.pm:22
 #, c-format
 msgid "Bringing up the network"
-msgstr "يجري تشغيل الشبكة"
+msgstr "جاري تشغيل الشبكة"
 
 #: interactive.pm:27
 #, c-format
 msgid "Bringing down the network"
-msgstr "يجري إغلاق الشبكة"
+msgstr "جاري إغلاق الشبكة"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
-msgstr "انتظر رجاءً، يجري جلب المل�"
+msgstr "انتظر رجاء، جاري جلب المل�"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr ""
+msgstr "لا يمكن إضا�ة وسيط"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "نسخ بعض الحزم إلى الأقراص لاستخدامها مستقبلاً"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
-msgstr "يجري النسخ"
+msgstr "جاري النسخ"
 
 #: pkgs.pm:32
 #, c-format
 msgid "must have"
-msgstr "يجب أن يكون لديك"
+msgstr "ضروري"
 
 #: pkgs.pm:33
 #, c-format
@@ -323,19 +413,35 @@ msgstr "مهم"
 #: pkgs.pm:34
 #, c-format
 msgid "very nice"
-msgstr "ظري� جداً"
+msgstr "جيد جدا"
 
 #: pkgs.pm:35
 #, c-format
 msgid "nice"
-msgstr "ظري�"
+msgstr "جيد"
 
 #: pkgs.pm:36
 #, c-format
 msgid "maybe"
 msgstr "ربما"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "جاري جلب معلومات الحزم من مل� XML..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"لا توجد معلومات xml للوسيط \"%s\"، إنما توجد معلومات جزئية �قط عن الحزمة %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "وص� غير متو�ر"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -344,66 +450,76 @@ msgstr ""
 "بعض الحزم التي يتطلبها %s لا يمكن تثبيتها:\n"
 "%s"
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "حدث خطأ"
+msgstr "حدث خطأ:"
+
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "حدث خطأ �ادح: %s"
 
-#: pkgs.pm:814
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "لا تسأل مرة أخرى"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
-msgstr ""
+msgstr "�شلت عملية تثبيت %d"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "تثبيت الحزمة %s"
+msgstr "�شل تثبيت الحزمة:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "محطة عمل"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
-msgstr "محطّة عمل مكتبية"
+msgstr "محطة عمل مكتبية"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"برامج مكتبية: معالجات كلمات (OpenOffice.org Writer، Kword)، جداول ممتدة "
+"برامج مكتبية: معالجات نصوص (OpenOffice.org Writer، Kword)، جداول ممتدة "
 "(OpenOffice.org Calc، Kspread)، برامج عرض pdf، إلخ"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
-msgstr "محطّة ألعاب"
+msgstr "محطة ألعاب"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "برامج تسلية: ألعاب �يديو، ألعاب لوحات، ألعاب استراتيجية، إلخ"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
-msgstr "محطة وسائط متعدّدة"
+msgstr "محطة وسائط متعددة"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
-msgstr "برامج تحرير/تشغيل �يديو وصوتيات"
+msgstr "برامج تحرير/تشغيل مرئيات وصوتيات"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
-msgstr "محطّة إنترنت"
+msgstr "محطة إنترنت"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -411,206 +527,206 @@ msgid ""
 msgstr ""
 "مجموعة أدوات لقراءة وإرسال البريد والأخبار (mutt، tin..) ولتص�ح الإنترنت"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "جهاز شبكة (عميل)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "عملاء لبروتوكولات مختل�ة بما �يها ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
-msgstr "أدوات لتسهيل ضبط حاسوبك"
+msgstr "أدوات لتسهيل ضبط حاسبك"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
-msgstr "أدوات الطر�يّات"
+msgstr "أدوات الطر�يات"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
-msgstr "محررات نصوص، صَدَ�ات، أدوات مل�ات، طر�يات"
+msgstr "محررات نصوص، صد�ات، أدوات مل�ات، طر�يات"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "تطوير"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
-msgstr "برامج ومكتبات تطوير C و C++ ومل�ات مضمنة"
+msgstr "مكتبات تطوير خاصة بلغة C وC++، برامج ومل�ات مضمنة"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "توثيق"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
-msgstr "القاعدة القياسيّة للينكس (LSB). دعم تطبيقات الطر� الثالث"
+msgstr "القاعدة القياسية للينكس (LSB). دعم تطبيقات الطر� الثالث"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "خادم وب"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "برامج مجموعات"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "خادم Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
-msgstr "جدار ناري/موجّ�ه"
+msgstr "جدار ناري/روتر"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "بوابة إنترنت"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "بريد/أخبار"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "خادم بريد Postfix، خادم أخبار Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
-msgstr "خادم مجلّدات"
+msgstr "خادم مجلدات"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "خادم FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
-msgstr "خادم أسماء نطاقات ومعلومات شبكة"
+msgstr "خادم أسماء النطاقات ومعلومات الشبكة"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
-msgstr "خادم مشاركة مل�ّات وطابعات"
+msgstr "خادم مشاركة المل�ات والطابعات"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
-msgstr "خادم NFS، خادم Samba"
+msgstr "خادم NFS، خادم سامبا"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "قواعد بيانات"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "خادم قواعد بيانات PostgreSQL و MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "خادم قواعد بيانات PostgreSQL و MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "وب/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache، Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "البريد"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "خادم بريد Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "خادم قواعد بيانات PostgreSQL أو MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "خادم قواعد بيانات PostgreSQL أو MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "خادم شبكات"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "بيئات رسومية"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
-msgstr "محطّة عمل ك�دي"
+msgstr "محطة عمل كدي"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
-msgstr "محطّة عمل جنوم"
+msgstr "محطة عمل جنوم"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -619,66 +735,128 @@ msgstr ""
 "بيئة رسومية مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين "
 "العاديين"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
 #, fuzzy, c-format
-msgid "LXDE Desktop"
-msgstr "سطح مكتب ك�دي"
+msgid "XFCE Workstation"
+msgstr "محطة عمل كدي"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:165
 #, fuzzy, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
 msgstr ""
 "بيئة رسومية مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين "
 "العاديين"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "محطة عمل جنوم"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "محطة عمل"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "بيئات رسومية"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "سطح مكتب LXDE"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"بيئة رسومية خ�ي�ة وسريعة مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة "
+"للمستخدمين العاديين"
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
+msgid "LXDE Desktop"
+msgstr "سطح مكتب LXDE"
+
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+"بيئة رسومية خ�ي�ة وسريعة مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة "
+"للمستخدمين العاديين"
+
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "سطح مكتب مخصص"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"بيئة سطح مكتب كدي، البيئة الرسومية الأساسية مع مجموعة من الأدوات المصاحبة"
+
+#: share/meta-task/compssUsers.pl:199
 #, 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:200
+#, 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:223
 #, c-format
 msgid "Utilities"
-msgstr "وسائل"
+msgstr "أدوات"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "خادم SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "خادم الضبط البعيد Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "وسائل الشبكة/المراقبة"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
-msgstr "أدوات مراقبة، محاسبة عمليّات، tcpdump، nmap، ..."
+msgstr "أدوات مراقبة، محاسبة عمليات، tcpdump، nmap، ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
-msgstr "مرشدو ماندري�ا"
+msgstr "مرشدو ماجيا"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "مرشدو ضبط الخادم"
@@ -689,10 +867,10 @@ msgid ""
 "An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"حدث خطأ ولا أعر� كي� أتعامل معه جيدًا،\n"
-"لذا تابع على مسؤوليتك."
+"حدث خطأ ولا أعر� كي� أتعامل معه جيدأ. \n"
+"تابع على مسؤوليتك."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -700,9 +878,9 @@ msgid ""
 "Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
 msgstr ""
-"لم يتمّ تثبيت بعض الحزم المهمّة بشكل صحيح.\n"
-"إمّا أن محرك الأقراص أو القرص ذاته معطوب.\n"
-"ا�حص القرص المدمج على حاسوب مثبت باستعمال \"rpm -qpl media/main/*.rpm\"\n"
+"لم يتم تثبيت بعض الحزم المهمة بشكل صحيح.\n"
+"إما أن محرك الأقراص أو القرص ذاته معطوب.\n"
+"ا�حص القرص المدمج على حاسب مثبت باستعمال \"rpm -qpl media/main/*.rpm\"\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
@@ -711,223 +889,228 @@ msgstr "الانتقال للخطوة `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "تثبيت لينكس ماندري�ا %s"
+msgid "%s Installation %s"
+msgstr "%s تثبيت %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> بين العناصر"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
-msgstr "تشغيل خادم Xorg بطيء، لذا انتظر رجاء"
+msgstr "تشغيل خادم Xorg بطيء. الرجاء الانتظار..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "موارد نظامك قليلة، لذا قد تقابل بعض المشكلات قي تثبيت\n"
-"لينكس ماندري�ا. إذا حدث ذلك، �يمكنك تجربة التثبيت النصي بديلاً. ول�عل ذلك،\n"
+"%s. إذا حدث ذلك، �يمكنك تجربة التثبيت النصي كبديل. للقيام بذلك،\n"
 "اضغط `F1' عند الإقلاع من القرص المدمج، ثم اكتب `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "تثبيت ماندري�ا بسطح مكتب ك�دي"
+msgid "Media Selection"
+msgstr "انتقاء الوسائط"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "تثبيت ماندري�ا بسطح مكتب جنوم"
+msgid "Install %s KDE Desktop"
+msgstr "تثبيت %s بسطح مكتب كدي"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "تثبيت %s بسطح مكتب جنوم"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "تثبيت مخصص"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
-msgstr "سطح مكتب ك�دي"
+msgstr "سطح مكتب كدي"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "سطح مكتب جنوم"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "سطح مكتب مخصص"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "هذه معاينة لشكل سطح مكتب %s"
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
-msgstr "اضغط على الصور لكي تراها كبيرة"
+msgstr "اضغط على الصور لتشاهد المعاينة بحجم أكبر"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "انتقاء مجموعات الحزم"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "انتقاء م�رد للحزم"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "الحجم الإجمالي: %d / %d م.ب"
+msgid "Unselect All"
+msgstr "إلغاء اختيار الكل"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "حزمة �اسدة"
+msgid "Total size: %d / %d MB"
+msgstr "الحجم الإجمالي: %d / %d م.ب"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "الإصدار: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "الحجم: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d ك.ب\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "الأهمية: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "لا يمكنك انتقاء/إلغاء انتقاء هذه الحزمة"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "بسبب نقص %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "بسبب عدم إرضاء %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "السعي إلى ترويج %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "من أجل الاحت�اظ بـ %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "لا يمكنك انتقاء هذه الحزمة لأنه لا يوجد مساحة كا�ية لتثبيتها"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "ستثبت الحزم التالية"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "ستحذ� الحزم التالية"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "هذه الحزمة إلزامية؛ لا يمكن إلغاء انتقائها"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "لا يمكن إلغاء انتقاء هذه الحزمة؛ لأنها مثبتة مسبقاً"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
-msgstr "لا يمكنك إلغاء انتقاء هذه الحزمة؛ لأن ترقيتها ضرورية"
+msgid "You cannot unselect this package. It must be upgraded"
+msgstr "لا يمكنك إلغاء انتقاء هذه الحزمة. لأن ترقيتها ضرورية"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
-msgstr "إظهار الحزم المنتقاة آليًا"
+msgstr "إظهار الحزم المنتقاة آليا"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "تثبيت"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "تحميل/ح�ظ الانتقاء"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "تحديث انتقاء الحزم"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
-msgstr "تثبيت مصغّر"
+msgstr "تثبيت مصغر"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "إدارة البرامج"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "اختر الحزم التي تريد تثبيتها"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "التثبيت"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "لا ت�اصيل"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "الوقت المتبقي:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
-msgstr "(الحساب التقريبي...)"
+msgstr "(حساب تقديري...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
@@ -935,115 +1118,110 @@ msgstr[0] "لا حزم"
 msgstr[1] "حزمة واحدة"
 msgstr[2] "حزمتان"
 msgstr[3] "%d حزم"
-msgstr[4] "%d حزمة"
-msgstr[5] "%d حزمة"
+msgstr[4] "%d حزم"
+msgstr[5] "%d حزم"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "ملخص"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "اضبط"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "غير مضبوط"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "انتقاء الوسائط"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
-"ع�ثر على وسائط التثبيت التالية.\n"
+"تم العثور على وسائط التثبيت التالية.\n"
 "إن كنت تريد تخطي بعضها، �يمكنك إلغاء انتقائها الآن."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "لديك الخيار بنسخ محتويات الأقراص المدمجة إلى قرصك الصلب قبل التثبيت.\n"
-"حيئذ، سيكمل التثبيت من القرص الصلب وستبقى الحزم متو�رة حتى يثبت النظام كاملاً."
+"حيئذ، سيكمل التثبيت من القرص الصلب وستبقى الحزم متو�رة حتى يثبت النظام كاملا."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "نسخ الأقراص كاملة"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "حدث خطأ"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
-msgstr "اختر تخطيط لوحة م�اتيحك رجاء"
+msgstr " اختر رجاء تخطيط لوحة م�اتيحك"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "هذه القائمة الكاملة لكلّ لوحات الم�اتيح المتاحة:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "تثبيت/ترقية"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "هل هذا تثبيت أم ترقية؟"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "تثبيت"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "ترقية %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
-msgstr "م�تاح التعمية لـ %s"
+msgstr "م�تاح التش�ير لـ %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
-msgstr "إلغاء التثبيت، وإعادة النظام"
+msgstr "إلغاء التثبيت، وإعادة تشغيل النظام"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "تثبيت جديد"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
-msgstr "ترقية تثبيت سابق (غير مستحسن)"
+msgstr "ترقية تثبيت سابق (لا ينصح به)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1051,43 +1229,24 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"تبين للمثبت أنه لا يمكن ترقية لينكس ماندري�ا\n"
-" المثبت عندك بأمان إلى %s\n"
+"تبين للمثبت أنه لا يمكن للنظام السابق\n"
+" أن يرقَّ بأمان لـ %s\n"
 " \n"
-" ي�نصح بثبيت جديد يحل محل التثبيت السابق\n"
+" ينصح بثبيت جديد يحل محل التثبيت السابق\n"
 " \n"
-" تحذير: ينبغي أن تنسخ جميع بياناتك الشخصية احتياطًا قبل اختيار\"تثبيت جديد\""
+" تحذير: ينبغي أن تنسخ جميع بياناتك الشخصية قبل اختيار\"تثبيت جديد\""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "ضبط IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"ليس هناك مساحة حرّة لواحد ميجابات من نظام الإقلاع! سو� يستمرّ التّثبيت، لكن "
-"لإقلاع نظامك، سو� تحتاج لإنشاء قسم لنظام الإقلاع �ي DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"تحتاج إلى إنشاء نظام إقلاع PPC PReP Boot! ستكمل عملية التثبيت، ولكن لإقلاع "
-"نظامك، أنت بحاجة إلى إنشاء لنظام الإقلاع من خلال DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1096,165 +1255,189 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "غيّر قرصك المدمج!\n"
-"من �ضلك أدخل القرص المسّمى \"%s\" �ي الّسواقة واضغط على موا�ق عندما تنتهي.\n"
-"إن لم يكن القرص لديك، اضغط على إلغاء لتجّنب التثبيت من هذا القرص."
+"من �ضلك أدخل القرص المسمى \"%s\" �ي السواقة واضغط على موا�ق عندما تنتهي.\n"
+"إن لم يكن القرص لديك، اضغط على إلغاء لتجنب التثبيت من هذا القرص."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "البحث عن الحزم المتاحة..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
-msgstr "لا توجد مساحة كا�ية �ي نظامك للتثبيت أو الترقية (%d > %dMB)"
+msgstr "لا توجد مساحة كا�ية �ي نظامك للتثبيت أو الترقية (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"اختر ح�ظ أو تحميل انتقائك للحزم رجاء.\n"
-"النسق مشابه لمل�ات التثبيت الآلي المولّدة."
+"اختر رجاء ح�ظ أو تحميل انتقائك للحزم.\n"
+"النسق مشابه للمل�ات الناتجة عن التثبيت الآلي."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
-msgstr "حمّ�ل"
+msgstr "تحميل"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
-msgstr "اح�ظ"
+msgstr "ح�ظ"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "مل� �اسد"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
-msgstr "ك�دي"
+msgstr "كدي"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "جنوم"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "انتقاء سطح المكتب"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
-msgstr "بإمكانك اختيار لاحة سطح محطة العمل هذه"
+msgstr "بإمكانك اختيار حساب سطح مكتب الخاص بك."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "الحجم المختار أكبر من المساحة المتاحة"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "نوع التثبيت"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 "لم تختر أي مجموعة من الحزم.\n"
-"رجاء اختر حد التثبيت الأدنى الذي تريده:"
+"اختر رجاء حد التثبيت الأدنى الذي تريده:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "مع X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "تثبيت الحزمة %s"
+msgid "Install recommended packages"
+msgstr "تثبيت الحزم المقترحة"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
-msgstr "مع وثائق المساعدة الأساسية (م�ضّل)"
+msgstr "مع وثائق المساعدة الأساسية (ينصح به)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
-msgstr "حد التثبيت الأدنى الحقيقي (دون urpmi خصوصًا)"
+msgstr "حد التثبيت الأدنى الحقيقي (دون urpmi خصوصا)"
+
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "التحضير للترقية..."
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
-msgstr "التثبيت ي�حضَّر"
+msgstr "التحضير للتثبيت"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "تثبيت الحزمة %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
-msgstr "كان هناك خطأ �ي ترتيب الحزم:"
+msgstr "حدث خطأ �ي ترتيب الحزم:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "هل تريد المتابعة على أية حال؟"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "أعد المحاولة"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "تخطّ هذه الحزمة"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "تخطّ جميع الحزم من الوسيط \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "ارجع إلى الوسائط وانتقاء الحزم"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
-msgstr "كان هناك خطأ �ي تثبيت الحزمة %s"
+msgstr "حدث خطأ �ي تثبيت الحزمة %s"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "ضبط ما بعد التثبيت"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "تأكد رجاء من وجود وسائط وحدات التحديث �ي محرك الأقراص %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "التحديثات"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1266,154 +1449,144 @@ msgid ""
 "\n"
 "Do you want to install the updates?"
 msgstr ""
-"ال�رصة أمامك الآن لتنزيل الحزم المحدّثة، �هذه الحزم\n"
-"قد ح�دّ�ثت بعد إصدار التوزيعة، وقد\n"
-"تحتوي على إصلاحات لع�لل أمنية أو برمجية.\n"
+"لديك الآن ال�رصة لتنزيل حزم محدثة، �هذه الحزم\n"
+"تم تحديثها بعد إصدار التوزيعة، وقد\n"
+"تحتوي على إصلاحات لعلل أمنية أو برمجية.\n"
 "\n"
 "لتنزيل هذه الحزم، تحتاج إلى اتصال \n"
 "بالإنترنت.\n"
 "\n"
 "هل تريد تثبيت هذه التحديثات؟"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s على %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "العتاد"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "بطاقة الصوت"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "هل لديك بطاقة صوت ISA؟"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "شغّل \"alsaconf\" أو \"sndconfig\" بعد التّثبيت لضبط بطاقة الصّوت"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "لم ي�عثر على بطاقة صوت. حاول تشغيل \"harddrake\" بعد التثبيت"
+msgstr "لم يتم التعر� على أي بطاقة صوت. حاول تشغيل \"harddrake\" بعد التثبيت"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "الواجهة الرسومية"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "الشبكة والإنترنت"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "الخوادم الوسيطة"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
-msgstr "مضبوط"
+msgstr "تم ضبطه"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "مستوى الأمن"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "جدار ناري"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
-msgstr "م�نشّط"
+msgstr "م�علة"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
-msgstr "م�عطّل"
+msgstr "معطلة"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
-msgstr "لم تقم بضبط خادم س (X). هل أنت متأكد أنك تريد ذلك؟"
+msgstr "لم تقم بضبط خادم (X). هل أنت متأكد أنك تريد ذلك؟"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "محمّل الإقلاع ي�حضَّر..."
+msgid "Preparing initial startup program..."
+msgstr "تحضير برنامج بدء التشغيل الأولي..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
-msgstr ""
+msgstr "كن صبورا، ستستغرق العملية بعض الوقت..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"يبدو أن لديك جهازاً مجهولاً أو قديماً جداً، ولن يعمل محمل الإقلاع yaboot مع "
-"نظامك. ستكمل عملية التثبيت، ولكنك بحاجة إلى استخدام BootX أو طريقة ما أخرى "
-"لإقلاع نظامك. م�عطى النواة لنظام المل�ات الجذر هو: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
-"�ي هذا المستوى الأمني، الوصول إلى المل�ّات �ي قسم وندوز سيكون مقصوراً على "
+"�ي هذا المستوى الأمني، الوصول إلى المل�ات �ي قسم وندوز سيكون مقصوراً على "
 "المدير."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
-msgstr "أدخل قرصًا مرنًا �ارغًا �ي محرك الأقراص %s"
+msgstr "أدخل قرصا مرنا �ارغا �ي محرك الأقراص %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "إنشاء قرص مرن للتثبيت الآلي..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
-"بعض الخطوات لم تتم.\n"
+"بعض الخطوات لم تكتمل.\n"
 "\n"
-"هل تريد الخروج الآن حقاً؟"
+"هل تريد الخروج الآن حقا؟"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "تهانينا"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
-msgstr "إعادة الحاسوب"
+msgstr "إعادة اﻹقلاع"
 
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
@@ -1447,7 +1620,7 @@ msgstr "ال�أرة"
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
-msgstr "اكتشا� القرص الصّلب"
+msgstr "اكتشا� القرص الصلب"
 
 #: steps_list.pm:21 steps_list.pm:22
 #, c-format
@@ -1505,26 +1678,19 @@ msgid ""
 "Users"
 msgstr "المستخدمون"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "الشبكات"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Bootloader"
-msgstr "محمّل الإقلاع"
+msgstr "محمل الإقلاع"
 
 #: steps_list.pm:40 steps_list.pm:41
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Configure X"
-msgstr "ضبط س (X)"
+msgstr "ضبط (X)"
 
 #: steps_list.pm:42
 #, c-format
@@ -1552,61 +1718,60 @@ msgstr "التحديثات"
 msgid ""
 "_: Keep these entry short\n"
 "Exit"
-msgstr "اخرج"
+msgstr "خروج"
+
+#~ msgid "Preparing bootloader..."
+#~ msgstr "تحضير محمل الإقلاع..."
+
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "بيئة رسومية خ�ي�ة وسريعة مع مجموعة من التطبيقات وأدوات سطح المكتب "
+#~ "المناسبة للمستخدمين العاديين"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "سطح مكتب مخصص"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "ليس هناك مساحة حرة لواحد ميجابات من نظام الإقلاع! ستستمر عملية التثبيت، "
+#~ "لكن لإقلاع نظامك، تحتاج لإنشاء قسم لنظام الإقلاع �ي DiskDrake"
 
 #~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
 #~ msgstr ""
-#~ "برامج مكتبية: معالجات كلمات (kword، abiword)، جداول ممتدة (kspread، "
-#~ "gnumeric)، برامج عرض pdf، إلخ"
+#~ "تحتاج إلى إنشاء نظام إقلاع PPC PReP Boot! ستستمر عملية التثبيت، لكن "
+#~ "لإقلاع نظامك، تحتاج لإنشاء قسم لنظام الإقلاع من خلال DiskDrake"
 
 #~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
 #~ msgstr ""
-#~ "لقد قررت ترقية نظامك إلى %s وقد تبين وجود ك�دي 3.5\n"
-#~ " على نظامك. لا يمكن للمثبت الاحت�اظ بالواجهة ك�دي 3.5 مع الترقية، إن اخترت "
-#~ "المواصلة، ستحل كيدي 4 مكان كيدي 3.5، وست�قد إعدادات ك�دي الشخصية\n"
-#~ " إن أردت الترقية مع إبقاء ك�دي 3.5 والاحت�اظ بإعداداتك الشخصية\n"
-#~ " �قم بإعادة الحاسوب والترقية باستخدام بريمج تحديث ماندري�ا."
+#~ "يبدو أن لديك جهازا مجهولا أو قديما جدا، ولن يعمل محمل الإقلاع yaboot مع "
+#~ "نظامك. ستستمر عملية التثبيت، لكنك بحاجة إلى استخدام BootX أو طريقة ما "
+#~ "أخرى لإقلاع نظامك. معطى النواة لنظام المل�ات الجذر هو: root=%s"
+
+#~ msgid "Select All"
+#~ msgstr "اختيار الكل"
 
-#~ msgid "Downloading file %s..."
-#~ msgstr "يجري تنزيل المل� %s ..."
+#~ msgid "Bad package"
+#~ msgstr "حزمة �اسدة"
 
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr "الترقية من توزيعة 32 بت إلى 64 بت غير مدعومة"
+#~ msgid "Preparing boot images..."
+#~ msgstr "جاري تحضير محمل الإقلاع..."
 
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr "الترقية من توزيعة 64 بت إلى 32 بت غير مدعومة"
+#~ msgid "Mageia, the new Linux distribution"
+#~ msgstr "ماجيّا ، توزيعة لينكس الجديدة"
 
 #~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "لقد اخترت الخوادم التالية: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "هذه الخوادم م�نشّطة ا�تراضياً، وليس �يها أي مشكلات أمنية\n"
-#~ "معرو�ة، لكن قد تكتش� بعض المشكلات الجديدة. �ي تلك الحالة، تأكد من أن\n"
-#~ "تقوم بالترقية �ي أقرب �رصة ممكنة.\n"
-#~ "\n"
-#~ "\n"
-#~ "هل أنت متأكد أنك تريد تثبيت هذه الخوادم؟\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "سطح مكتب IceWm"
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "الشبكات"
diff --git a/perl-install/install/share/po/ast.po b/perl-install/install/share/po/ast.po
index cb36acecd..02f2f9b02 100644
--- a/perl-install/install/share/po/ast.po
+++ b/perl-install/install/share/po/ast.po
@@ -1,55 +1,84 @@
-# translation of drakx to Asturian
-# asturian translation of DrakX
-# Copyright (C) 2000, 2001,2002, 2009 Mandriva S.A.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Softastur <alministradores@softastur.org>, 2009.
+# Translators:
+# enolp <enolp@softastur.org>, 2015
+# Ḷḷumex03 <tornes@opmbx.org>, 2014
+# Ḷḷumex03 <tornes@opmbx.org>, 2014
+# Softastur <alministradores@softastur.org>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+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"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-26 19:01+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/mageia/language/"
+"ast/)\n"
 "Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "El to escritoriu nun llápiz USB"
+msgid "Join Us!"
+msgstr "¡Xúnite a nós!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "La distribución Mageia Linux 100%% códigu llibre"
+msgid "Make it yours!"
+msgstr "¡Failu de to!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Restola Linux con facilidá per aciu de Mageia One"
+msgid "Your choice!"
+msgstr "¡La to escoyeta!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Un escritoriu Mageia Linux completu, con sofitu"
+msgid "Office tools"
+msgstr "Ferramientes d'oficina"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: distribuciones pa les necesidaes de toos"
+msgid "Home entertainment"
+msgstr "Entretenimientu llariegu"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Pa guaḥes"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "¡Pa la famila!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "¡Pa desendolcadores!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "¡Gracies!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "¡Se llibre!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr "¿Tienes dalgún soporte d'instalación suplementariu?"
+msgstr "¿Tienes dalgún mediu d'instalación suplementariu?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -57,98 +86,95 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
-"Alcontrarónse los medios siguientes y usaránse durante la instalación: %s.\n"
+"Alcontrarónse los medios siguientes y usaránse na instalación: %s.\n"
 "\n"
 "\n"
-"¿Tienes dalgún sofitu suplementariu que configurar?"
+"¿Tienes dalgún mediu suplementariu pa configurar?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Rede(HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Rede(FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Rede(NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "¿URL del espeyu?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "La URL tien d'entamar con ftp:// o http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Contautando col sitiu web de Mageia Linux p'algamar la llista d'espeyos "
-"disponibles"
+"Contautando col sitiu web de %s p'algamar la llista d'espeyos disponibles"
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Nun pudo coneutase col sitiu web de Mageia Linux p'algamar la llista "
-"d'espeyos disponibles"
+"Nun pudo coneutase col sitiu web de %s p'algamar la llista d'espeyos "
+"disponibles"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Escueye un espeyu del qu'algamar los paquetes"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Configuración NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, 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"
+msgstr "Introduz el nome de sirvidor y el direutoriu del to mediu NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Falta'l nome del sirvidor"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "El direutoriu tien qu'entamar con \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "¿Nome del sirvidor del montaxe NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Direutoriu"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Suplementariu"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -157,23 +183,98 @@ msgstr ""
 "Nun pudo alcontrase'l ficheru hdlist nesti espeyu. Asegúrate que "
 "l'allugamientu ye correutu."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Llanzamientu Core"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Llanzamientu Tainted"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Llanzamientu nonfree"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Dél hardware de la to máquina necesita dalgún firmware non llibre pa que los "
+"controladores de software llibre furrulen."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Deberíes habilitar \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" caltien delles pecies de los sistemes y les sos aplicaciones"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" caltien software non llibre.\n"
+
+#: any.pm:477
+#, 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 ""
+"Tamién caltien firmwares necesarios pa que ciertos preseos furrulen (exem.: "
+"dalgunes gráfiques ATI/AMD, dalgunes tarxetes de rede, dalgunes tarxetes "
+"RAID...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" caltien software que nun pue distribuyise en cada país pola mor de "
+"patentes de software."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"Tamién caltien software de \"%s\" reconstruyíu con capacidaes adicionales."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Equí pues habilitar más medios si quies."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Esti mediu apurre anovamientos de paquete pal mediu \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Guetando paquetes ya instalaos..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Alcontrando los paquetes a anovar..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -187,89 +288,89 @@ msgstr ""
 "\n"
 "¿De xuro que quies desanciar estos paquetes?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fallu al lleer el ficheru %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Renomáronse los siguientes discos:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (enantes conocíu como %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rede"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
-msgstr "Por favor, escueye un soporte"
+msgstr "Por favor, escueyi un mediu"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "El ficheru yá existe. ¿Quies sobroscribilu?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permisu torgáu"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nome NFS incorreutu"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Mediu %s incorreutu"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
-msgstr "Nun pueden facese captures de pantalla enantes del particionáu"
+msgstr "Nun puen facese captures de pantalla enantes del particionáu"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 "Dempués de la instalación tarán disponibles les instantánees de pantalla en "
 "%s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalación"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configuración"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Tamién tien que formatease %s"
@@ -294,22 +395,22 @@ msgstr "Llevantando la rede"
 msgid "Bringing down the network"
 msgstr "Baxando la rede"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Por favor espera, recuperando ficheru"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "nun puede amestase'l preséu"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Copiando dalgunos paquetes nel discu pa usu futuru"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Copia en cursu"
@@ -327,87 +428,114 @@ msgstr "importante"
 #: pkgs.pm:34
 #, c-format
 msgid "very nice"
-msgstr "perbono"
+msgstr "perbonu"
 
 #: pkgs.pm:35
 #, c-format
 msgid "nice"
-msgstr "bono"
+msgstr "bonu"
 
 #: pkgs.pm:36
 #, c-format
 msgid "maybe"
 msgstr "quiciabes"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Consiguiendo información de paquete del meta-data XML..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Nun hai información XML pa mediu \"%s\", namái resultaos parciales pal "
+"paquete %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Ensin descripción"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
-"Dalgunos paquetes que necesites %s nun pueden instalase:\n"
+"Dellos paquetes solicitaos por %s nun puen instalase:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Hebo un fallu:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Hebo un fallu grave: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Nun entrugar más"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "Fallaron %d tresaiciones d'instalación"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, 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:16
 #, c-format
 msgid "Workstation"
 msgstr "Estación de trabayu"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Estación de trabayu d'Oficina"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programes d'Oficina: procesadores de testu (OpenOffice.org Writer, Kword), "
-"fueyes de cálculu (OpenOffice.org Calc, Kspread), visualizadores PDF, etc"
+"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:26
 #, c-format
 msgid "Game station"
 msgstr "Estación de Xuegos"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, 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:30
 #, c-format
 msgid "Multimedia station"
-msgstr "Estación Multimedia"
+msgstr "Estación multimedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, 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:36
 #, c-format
 msgid "Internet station"
 msgstr "Estación d'Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -416,193 +544,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:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Ordenador de Rede (veceru)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, 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:49
 #, 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:53
 #, c-format
 msgid "Console Tools"
 msgstr "Ferramientes pa la consola"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Desendolcu"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentación"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, 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:79
 #, c-format
 msgid "Web Server"
 msgstr "Sirvidor web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Grupos de trabayu"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
-msgstr "Tornafuegos/Router"
+msgstr "Tornafueos/Router"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Pasarela d'accesu a Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Corréu/Noticies"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, 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:97
 #, c-format
 msgid "Directory Server"
 msgstr "Sirvidor de direutorios"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Sirvidor FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, 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:112
 #, 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:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Base de Datos"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Sirvidor de base de datos PostgreSQL y MySQL"
+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:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache y Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Corréu"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Sirvidor de corréu Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Sirvidor de base de datos PostgreSQL o MySQL"
+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:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Sirvidor de rede"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Entornu gráficu"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Estación de trabayu KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -611,12 +739,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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Estación de trabayu GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -625,66 +753,125 @@ 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:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Estación de trabayu XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Un entornu d'escritoriu más llixeru con un conxuntu d'aplicaciones y "
+"ferramientes amigables"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Estación de trabayu MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Estación de trabayu Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Un entornu gráficu basáu en GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Escritoriu LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Un entronu d'escritoriu basáu en QT y LXDE de nueva xeneración"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Escritoriu Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Un entornu gráficu rápidu y llixeru con un siguimientu dedicáu"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Escritoriu LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Un entronu d'escritoriu rápidu y llixeru"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Escritoriu Plasma"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Un entornu gráficu llixeru y rápidu con un conxuntu de ferramientes "
-"d'escritoriu y aplicaciones amigables"
+"L'escritoriu Plasma, l'entornu gráficu básicu con una coleición de "
+"ferramientes"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Otros entornos gráficos"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilidaes"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Sirvidor SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, 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:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Utilidaes/Supervisión de rede"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, 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:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Asistentes de Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Asistentes pa configurar el sirvidor"
@@ -698,7 +885,7 @@ msgstr ""
 "Hebo un fallu y nun puede resolvese de mou adecuáu.\n"
 "Sigui baxo'l to propiu riesgu."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -707,9 +894,9 @@ msgid ""
 "\"\n"
 msgstr ""
 "Dalgunos paquetes importantes nun s'instalaron correutamente.\n"
-"Puede ser que'l to lleutor de CD o'l to CD d'instalación ten defeutuosos.\n"
-"Verifica'l CD d'instalación nun sistema yá esistente col comandu:\n"
-"  rpm -qpl media/main/*.rpm\n"
+"Pue ser que'l to llector de CD o'l to CD d'instalación tean defeutuosos.\n"
+"Comprueba'l CD d'instalación nun sistema yá esistente col comandu: rpm -qpl "
+"media/main/*.rpm\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
@@ -718,266 +905,265 @@ msgstr "Entrando na etapa '%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Instalación de Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Instalación de %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> ente elementos"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "El sirvidor Xorg tarda n'aniciar. Por favor, espera..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "El to sistema tien pocos recursos. Puedes tener dalgún problema instalando\n"
-"Mageia Linux. De ser asina, puedes intentar una instalación de la triba "
-"testu.\n"
+"%s. De ser asina, puedes intentar una instalación de la triba testu.\n"
 "Pa ello, calca 'F1' cuando anicie'l CDROM, ya introduz 'text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Instalar l'escritoriu KDE de Mageia"
+msgid "Media Selection"
+msgstr "Esbilla de medios"
+
+#: steps_gtk.pm:253
+#, c-format
+msgid "Install %s KDE Desktop"
+msgstr "Instalar l'escritoriu KDE de %s"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Instalar l'escritoriu GNOME de Mageia"
+msgid "Install %s GNOME Desktop"
+msgstr "Instalar l'escritoriu GNOME de %s"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Instalación personalizada"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Escritoriu KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Escritoriu GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Escritoriu personalizáu"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Equí tienes una previsualización del escritoriu '%s'."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Calca nes semeyes p'agrandales"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
-msgstr "Seleición de grupos de paquetes"
+msgstr "Esbilla de grupos de paquetes"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Seleición de paquetes individuales"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Tamañu total: %d / %d MB"
+msgid "Unselect All"
+msgstr "Deseleicionar too"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Paquete incorreutu"
+msgid "Total size: %d / %d MB"
+msgstr "Tamañu total: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versión: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Tamañu: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Importancia: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Nun puede seleicionase/deseleicionase esti paquete"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "debíu a que falta %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "debíu a que nun se satisfizo %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "intentando promover a %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "pa caltener %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Nun pudo seleicionase esti paquete porque nun hai espaciu abondo pa instalalu"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Van instalase los paquetes siguientes"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Van desaniciase los paquetes siguientes"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Esti ye un paquete obligatoriu, nun puedes desmarcalu"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Nun puedes desmarcar esti paquete. Yá ta instaláu"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Nun puedes desmarcar esti paquete. Tien d'anovase"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Amosar los paquetes esbillaos automáticamente"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalar"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Cargar/Guardar seleición"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Anovando la seleición de paquetes"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Instalación mínima"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Alministración de software"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Escueyi los paquetes que quies instalar"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalando"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Ensin detalles"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Tiempu restante:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(estimando...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d paquete"
 msgstr[1] "%d paquetes"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Resume"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configurar"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "non configuráu"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Seleición de preseos"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
-"Alcontrarónse los siguientes preseos d'instalación.\n"
-"Si quies saltate dalgún d'ellos, puedes deseleicionalos agora."
+"Alcontrarónse los medios d'instalación siguientes.\n"
+"Si quies saltate dalgún d'ellos, pues deseleicionalos agora."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Tienes la opción de copiar los conteníos de los CD al discu duru enantes de "
@@ -985,72 +1171,72 @@ 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:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copiar los CD por completu"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Hebo un fallu"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Por favor, escueyi la distribución del to tecláu"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Equí tienes la llista completa de teclaos disponibles:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalación/Anovamientu"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "¿Ye una instalación o un anovamientu?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalación"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
-msgstr "Anovar %s"
+msgstr "Anovamientu de %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clave de cifráu pa %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Encaboxar la instalación, volver a aniciar el sistema"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Instalación nueva"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Anovar la instalación previa (nun s'encamienta)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1058,45 +1244,26 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"L'instalador deteutó que nun puede anovase con seguridá'l to\n"
-"sistema Mageia Linux ya instaláu a la versión %s.\n"
+"L'instalador deteutó que'l to sistema instaláu Linux nun pudo anovase\n"
+"de mou seguru a %s.\n"
 "\n"
-"Encamiéntase una instalación nueva que camude a la anterior.\n"
+"Aconséyase una instalación nueva trocando tolo postrero.\n"
 "\n"
-"¡Atención: tendríes de facer copia de respaldu de tolos tos datos\n"
-"enantes d'entamar cola instalación nueva!"
+"Avisu: deberíes facer copia de seguridá de tolos tos datos personales "
+"enantes d'escoyer \"Instalación\n"
+"nueva\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Configurando preseos IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"¡Nun hai 1MB d'espaciu pa bootstrap! La instalación siguirá, pero p'aniciar "
-"el to sistema, necesitarás criar la partición bootstrap en DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"¡Necesites criar un bootstrap d'arranque PReP PPC! La instalación siguirá, "
-"pero p'arrancar el to sistema, necesitarás criar la partición bootstrap en "
-"DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1110,12 +1277,12 @@ msgstr ""
 "cuando lo faigas.\n"
 "Si nun lu tienes, calca Encaboxar pa evitar la instalación dende esti CD-ROM."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Guetando los paquetes disponibles..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1124,7 +1291,7 @@ msgstr ""
 "El to sistema nun tien espaciu llibre abondo pa la instalación o "
 "l'anovamientu (%d MB > %d MB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1134,52 +1301,52 @@ msgstr ""
 "El formatu ye'l mesmu que'l de los ficheros xeneraos cola instación "
 "automática."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Cargar"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Guardar"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Ficheru incorreutu"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Seleición del entornu d'escritoriu"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
-msgstr "Puedes escoyer un perfil d'escritoriu d'estación de trabayu."
+msgstr "Pues escoyer el to perfil d'escritoriu d'estación de trabayu."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "El tamañu esbilláu ye mayor que'l disponible"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Triba d'instalación."
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1188,88 +1355,112 @@ msgstr ""
 "Nun esbillasti dengún grupu de paquetes\n"
 "Por favor, escueye la instalación mínima que quies."
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Con X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Instalando'l paquete suxeríu"
+msgid "Install recommended packages"
+msgstr "Instalar paquetes aconseyaos"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Con documentación básica (¡encamentao!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instalación mínima \"en serio\" (especialmente ensin urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Tresnando anovamientu..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Tresnando la instalación"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalando'l paquete %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Hebo un fallu al axeitar los paquetes:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "¿Siguir p'alantre?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Reintentalo"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Omitir esti paquete"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Omitir tolos paquetes del preséu \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
-msgstr "Volver a la seleición de paquetes"
+msgstr "Volver a la esbilla de paquetes"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Hebo un fallu al instalar el paquete %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuración posterior a la instalación"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
-"Por favor, asegúrate de que'l preséu d'anovamientu de módulos ta na unidá %s"
+"Por favor, asegúrate de que'l mediu d'anovamientu de módulos ta na unidá %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Anovamientos"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1290,28 +1481,29 @@ msgstr ""
 "\n"
 "¿Quies instalar los anovamientos?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s en %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Tarxeta de soníu"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "¿Tienes una tarxeta de soníu ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1320,82 +1512,70 @@ msgstr ""
 "Usa \"alsaconf\" o \"sndconfig\" dempués de la instalación pa configurar la "
 "to tarxeta de soníu"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, 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:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interface gráfica"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Redes ya Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxies"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "configuráu"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Nivel de seguridá"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Tornafueos"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "activáu"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "desactiváu"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, 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:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Tresnando'l cargador d'arranque"
+msgid "Preparing initial startup program..."
+msgstr "Tresnando'l programa d'aniciu inicial..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Aposenta por favor, pues esto puede llevar un ratu."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Parez que tienes una máquina desconocida o \"Old World\", el xestor "
-"d'arranque yaboot nun furrulará na mesma. La instalación siguirá, pero "
-"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:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1404,17 +1584,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:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Inxerta un disquete en blancu na unidá %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Criando'l disquete d'instalación automática"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1425,12 +1605,12 @@ msgstr ""
 "\n"
 "¿De xuru quies colar agora?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Felicidaes"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Reaniciar"
@@ -1525,13 +1705,6 @@ msgid ""
 "Users"
 msgstr "Usuarios"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Rede"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1573,115 +1746,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Colar"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programes d'Oficina: procesadores de pallabres (kword, abiword), plantíes "
-#~ "de cálculu (kspread, gnumeric), visualizadores PDF, etc"
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Decidió actualizar su sistema a %s. Se detectó que Ud. tiene KDE 3.5\n"
-#~ "en su sistema. El instalador no puede preservar KDE 3.5 al actualizar.\n"
-#~ "Si Ud. decide continuar, KDE 4 reemplazará a KDE 3, y perderá la\n"
-#~ "configuración personalizada de KDE. \n"
-#~ "Para actualizar con KDE 3.5 y preservar su configuración, por favor\n"
-#~ "vuelva a iniciar su sistema y actualize utilizando el applet Mandriva "
-#~ "Update."
-
-#~ msgid "Proceed"
-#~ msgstr "Continuar"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "La recuperación de [%s] falló"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Descargando el archivo %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr ""
-#~ "No se soporta la acutalización de una distribución 32 bit a una 64 bit"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr ""
-#~ "No se soporta la actualización de una distribución 64 bit a una 32 bit"
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Ha seleccionado los siguientes servidores: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Estos servidores se activan por defecto. No se les conocen problemas de\n"
-#~ "seguridad, pero se pueden encontrar problemas nuevos. En ese caso, debe "
-#~ "asegurarse de\n"
-#~ "actualizarlos tan pronto como sea posible.\n"
-#~ "\n"
-#~ "\n"
-#~ "¿Realmente desea instalar estos servidores?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "Escritorio IceWm"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr ""
-#~ "Contactando con el sitio de réplica para obtener la lista de los paquetes "
-#~ "disponibles..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "No se puede contactar al sitio de réplica %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Generar un disquete de instalación automática"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "La instalación automática puede automatizarse por completo si lo desea,\n"
-#~ "¡¡en ese caso se adueñará del disco rígido!!\n"
-#~ "(la intención de esto es instalarlo en otro ordenador).\n"
-#~ "\n"
-#~ "Puede preferir reproducir la instalación.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Reproducir"
-
-#~ msgid "Automated"
-#~ msgstr "Automatizada"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Guardar la selección de paquetes"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "¿Desea usar aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Ocurrió un error al instalar aboot, \n"
-#~ "¿desea forzar la instalación incluso si ello implicara la destrucción de "
-#~ "la primera partición?"
diff --git a/perl-install/install/share/po/az.po b/perl-install/install/share/po/az.po
index 00480b759..2ef6cc1f0 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: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+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"
@@ -21,38 +21,63 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Ofis İş Stansiyası"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "For developers!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Thank you!"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, fuzzy, c-format
 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:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -61,116 +86,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, fuzzy, c-format
 msgid "Network (HTTP)"
 msgstr "Şəbəkə %s"
 
-#: any.pm:122
+#: any.pm:164
 #, fuzzy, c-format
 msgid "Network (FTP)"
 msgstr "Şəbəkə %s"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Mövcud əkslərin siyahısını almaq üçün Mageia Linux səhifəsi ilə təmas "
-"qurulur..."
+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:187
+#: any.pm:253
 #, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr ""
-"Mövcud əkslərin siyahısını almaq üçün Mageia Linux səhifəsi ilə təmas "
-"qurulur..."
+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:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Paketleri almaq üçün bir əks ünvanı seçin"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Qovluq"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, 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:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Qurulu olan paketlər yoxlanır..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Güncəllənəcək paketlar tapılır"
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -183,87 +269,87 @@ msgstr ""
 "\n"
 "Bu paketləri həqiqətən də silmək istəyirsiniz?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s faylı oxunurkan xəta oldu"
 
-#: any.pm:1020
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Aşağıdakı paketlər qurulmalıdır:\n"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Şəbəkə"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Xahiş edirik seçin"
 
-#: any.pm:1118
+#: any.pm:1402
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fayl onsuz da mövcuddur. Üstünə yazım?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Səlahiyyət yoxdur"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "%s medyası əlavə edildi"
 
-#: any.pm:1234
+#: any.pm:1519
 #, 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:1242
+#: any.pm:1530
 #, 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"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "Qurulur"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Quraşdırma"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Eyni zamanda %s da şəkilləndirilməlidir"
@@ -288,22 +374,22 @@ msgstr "Şəbəkə fəallaşdırılır"
 msgid "Bringing down the network"
 msgstr "Şəbəkə dayandırılır"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Təsbit etmə fəaliyyətdədir"
@@ -333,73 +419,98 @@ msgstr "É™'la"
 msgid "maybe"
 msgstr "bəlkə"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Ä°zahat yoxdur"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Bir xəta oldu"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Ölümcül xəta yarandı: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Qurulum bacarılmadı"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "%s paketi qurulur"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "İş Stansiyası"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Ofis İş Stansiyası"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"İdarə proqramları: kəlmə işləyənlər (OpenOffice.org Writer, Kword), "
+"İ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:26
 #, c-format
 msgid "Game station"
 msgstr "Oyun stansiyası"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, 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:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedya stansiyası"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, 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:36
 #, c-format
 msgid "Internet station"
 msgstr "İnternet stansiyası"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -408,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:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Şəbəkə Kompüteri (alıcı)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, 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:49
 #, 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:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsol Vasitələri"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Ä°nkiÅŸaf"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, 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:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, 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:79
 #, c-format
 msgid "Web Server"
 msgstr "Veb Vericisi"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "Qrup"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "İnternet keçidi"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Fayl/_Təze"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, 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:97
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "CD'dən Geri Yüklə"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "NTP Verici"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "DNS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, 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:112
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Çapçı Vericisi"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Mə'lumat Bazası"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, fuzzy, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL ya da MySQL mə'lumat bazası vericisi"
+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:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Veb/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Poçt"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix poçt vericisi"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ya da MySQL mə'lumat bazası vericisi"
+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:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Şəbəkə Kompüter vericisi"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Qrafiki Mühit"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE iş stansiyası"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME iş stansiyası"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -614,65 +725,124 @@ 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:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE iş stansiyası"
+
+#: share/meta-task/compssUsers.pl:165
+#, 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:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME iş stansiyası"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "İş Stansiyası"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Qrafiki Mühit"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "Masa üstü"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, 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:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Masa üstü"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 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:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Masa üstü"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, 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:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Başqa qrafiki ara üzlər"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, 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:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Vericisi"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Veb kamerası"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, 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:235
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Şəbəkə İzlənməsi"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "<b>Mageia Store</b>"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "\"%s\" çapçısı quraşdırıla bilmədi!"
@@ -686,7 +856,7 @@ msgstr ""
 "Bir xəta oldu, yalnız necə düzəldiləcəyi bilinmir.\n"
 "Davam edin, riski sizÉ™ aitdir!"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -706,24 +876,24 @@ msgstr "Başlanğıc addımı `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux Qurulumu %s"
+msgid "%s Installation %s"
+msgstr "%s Qurulumu %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> irəli/geri"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
-#, c-format
+#: steps_gtk.pm:212
+#, fuzzy, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Sizin sisteminizin qaynaqları çatışmır. Qurulum ərzində problem yaşaya "
@@ -732,306 +902,306 @@ msgstr ""
 "dəCDROMdan başlatdığınız zaman,\n"
 " 'F1'ə basın və 'text' yazaraq enter'ə basın."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Paket Qruplarının Seçimi"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Minimal qurulum"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "Masa üstü"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "Masa üstü"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "Masa üstü"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Paket Qruplarının Seçimi"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Fərdi paket seçimi"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Ümumi böyüklük: %d / %d Mb"
+msgid "Unselect All"
+msgstr "Seçili olmayan hamısını"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Xətalı paket"
+msgid "Total size: %d / %d MB"
+msgstr "Ümumi böyüklük: %d / %d Mb"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Buraxılış: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Böyüklük: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "�həmiyyət:"
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Bu paketi seçə bilməzsiniz/sistemdən çıxarda bilməzsınız"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s əksik olduğuna görə"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s razı qalmadığına görə"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s irəliləndirməyə çalışılır"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s-i saxlamaq üçün"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"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:456
+#: 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:457
+#: 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:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+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:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+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:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Bu paketi sistemdən çıxarda bilməzsiniz. Yenilənməlidir"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Avtomatik seçili paketləri göstər"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Qur"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "Seçili olanı qeyd et"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Paket seçkiləri yenilənir"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal qurulum"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Proqram Tə'minatı İdarəsi"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Qurmaq istədiyiniz paketləri seçin"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Qurulur"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Təfsilatsız"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Qalan müddət"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Təxmini olaraq hesaplanır"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d paket"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Ä°cmal"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Qur"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "quraşdırılmayıb"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Paket Qruplarının Seçimi"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Bir xəta oldu"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Xahiş edirik, klaviatura düzülüşünüzü seçin"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Bütün mövcud ölkələrinn siyahısı"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Qurulum/Yeniləmə"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Bu bir qurulum, yoxsa yeniləmədir?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Qur"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s-i yenilÉ™"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s üçün şifrələmə açarı"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Qurulur"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1040,36 +1210,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "Ä°DE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "İDE qapıları qurulur"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"1 MB bootstrap üçün yer yoxdur! Qurulum davam edəcək, ancaq sisteminizi aça "
-"bilmək üçün DiskDrake'də bootstrap bölməsi yaratmalısınız."
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"1 MB bootstrap üçün yer yoxdur! Qurulum davam edəcək, ancaq sisteminizi aça "
-"bilmək üçün DiskDrake'də bootstrap bölməsi yaratmalısınız."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, fuzzy, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1084,19 +1235,19 @@ msgstr ""
 "�gər CD-ROM əlinizdə deyilsə, bu CD-Rom'dan qurmamaq üçün Ləğv Et düyməsinə "
 "basın."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Mövcud olan paketlər axtarılır."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1105,52 +1256,52 @@ msgstr ""
 "Xahiş edirik, paket seçkilərini disketə qeyd et/disketdən yüklə\n"
 "seçənəyini seçin."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Yüklə"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Qeyd Et"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Səhv fayl"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "Ä°DE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Paket Qruplarının Seçimi"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Seçili böyüklük var olandan daha böyükdür"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Qurulum növü"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1159,87 +1310,111 @@ msgstr ""
 "Heç bir paket qrupunu seçmədiniz.\n"
 "Xahiş edirik, istədiyiniz ən kiçik qurulumu seçin:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X ilÉ™"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "%s paketi qurulur"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "�sas sənədlərlə birlikdə (məsləhət edilən!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Həqiqətən minimal qurulum (xüsusilə urpmi olmasın)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Açılış yükləyici hazırlanır"
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Qurulum hazırlanır"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s paketi qurulur"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Paketləri istərkən xəta yarandı:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Yenə də davam edək?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Geri yüklə"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Paket seçkilərini qeyd et"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Paketlər qurulurkən bir xəta oldu:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Qurulum sonrası qurğular"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Yeniləmələr"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1261,28 +1436,29 @@ msgstr ""
 "\n"
 "Yeniləmələri qurmaq istəyirsiniz ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s üstündə %1$s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Avadanlıq"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Səs kartı"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Heç İSA səs kartınız var?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, fuzzy, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1290,97 +1466,85 @@ msgid ""
 msgstr ""
 "Qurulumdan sonra səs kartınızı qurğulamaq üçün \"sndconfig\" əmrini icra edin"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, 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:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Qrafiki ara üz"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Şəbəkə və İnternet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Vəkil vericiləri"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "quraşdırılıb"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Təhlükəsizlik Səviyyəsi"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Atəş Divarı"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "fəal"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "qeyri-fəal"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, 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:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Açılış yükləyici hazırlanır"
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Qurulum hazırlanır"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, fuzzy, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Dünyadan kənar yerdən gələn ya da namə'lum\n"
-" sisteminiz var, yaboot açılış yükləyicisi sizin üçün işləməyəcək.\n"
-"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:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, 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:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Avtomatik qurulum disketi hazırlanır"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1391,12 +1555,12 @@ msgstr ""
 "\n"
 "Həqiqətən də çıxmaq istəyirsiniz?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Təbriklər"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Yenidən başlat"
@@ -1491,13 +1655,6 @@ msgid ""
 "Users"
 msgstr "İstifadəçilər"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Şəbəkə"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1540,6 +1697,67 @@ msgid ""
 "Exit"
 msgstr "Çıxış"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Açılış yükləyici hazırlanır"
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast 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"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Masa üstü"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "1 MB bootstrap üçün yer yoxdur! Qurulum davam edəcək, ancaq sisteminizi "
+#~ "aça bilmək üçün DiskDrake'də bootstrap bölməsi yaratmalısınız."
+
+#, fuzzy
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "1 MB bootstrap üçün yer yoxdur! Qurulum davam edəcək, ancaq sisteminizi "
+#~ "aça bilmək üçün DiskDrake'də bootstrap bölməsi yaratmalısınız."
+
+#, fuzzy
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Dünyadan kənar yerdən gələn ya da namə'lum\n"
+#~ " sisteminiz var, yaboot açılış yükləyicisi sizin üçün işləməyəcək.\n"
+#~ "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"
+
+#~ msgid "Welcome"
+#~ msgstr "Xoş Gəldiniz"
+
+#~ msgid "Select All"
+#~ msgstr "Hamısı Seçildi"
+
+#~ msgid "Bad package"
+#~ msgstr "Xətalı paket"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Açılış yükləyici hazırlanır"
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Şəbəkə"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1590,7 +1808,7 @@ msgstr "Çıxış"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/be.po b/perl-install/install/share/po/be.po
index d74b4a6ac..55fcf8f48 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: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2000-09-24 12:30 +0100\n"
 "Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
 "Language-Team: be\n"
@@ -15,38 +15,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Працоўны� мей�цы"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Thank you!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Be Free!"
 msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Ці ё�ць у ва� іншы?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -55,112 +80,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, fuzzy, c-format
 msgid "Network (HTTP)"
 msgstr "Сетка"
 
-#: any.pm:122
+#: any.pm:164
 #, fuzzy, c-format
 msgid "Network (FTP)"
 msgstr "Сетка"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, fuzzy, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "Сув�зь з люрам дл� атрыманн� �пі�у да�тупных пакетаў"
 
-#: any.pm:187
+#: any.pm:253
 #, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr "Сув�зь з люрам дл� атрыманн� �пі�у да�тупных пакетаў"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Выбар лю�тра дл� атрыманн� пакетаў"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Каталёг"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "�е знойздены праграмы\n"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, fuzzy, c-format
 msgid "Looking at packages already installed..."
 msgstr "Вы не можаце адм�ніць вылуч�нне г�тага пакету. �н ужо ў�тал�ваны"
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Пошук пакетаў дл� абнаўленн�"
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -169,87 +259,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Памылка чытанн� файлу %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "�а�тупны� пакеты будуць даданы да �і�т�мы"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "ФС"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Сетка"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Калі ла�ка выб�рыце відары� від�а"
 
-#: any.pm:1118
+#: any.pm:1402
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Файл ужо й�нуе. Перапі�аць?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "�дмоўлена ў до�тупе"
 
-#: any.pm:1170
+#: any.pm:1454
 #, fuzzy, c-format
 msgid "Bad NFS name"
 msgstr "Б�з назвы"
 
-#: any.pm:1191
+#: any.pm:1475
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "Загружаецца файл %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, fuzzy, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Дадаць раздзел немагчыма"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "У�талёўваем"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Канфігурацы�"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr ""
@@ -273,22 +363,22 @@ msgstr "Далуч�нне да �еткі"
 msgid "Bringing down the network"
 msgstr "�длуч�нне ад �еткі"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Ствар�ньне меню ўжо запушчана"
@@ -318,266 +408,293 @@ msgstr "добра"
 msgid "maybe"
 msgstr "можа быць"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "�пі�аньне ад�утнічае"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "�дбыла�� памылка"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, fuzzy, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+"П�МЫЛ�ЧК� �ТРЫМ�Л�СЯ: \n"
+"%s"
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "У�тал�ванне SILO"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "У�тал�ванне пакету %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "Канфігурацы�"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "Працоўны� мей�цы"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Офі�ны� праграмы: прац��ары �ловаў (OpenOffice.org Writer, Kword), "
-"�лектроны� табліцы, агл�дальнікі pdf-файлаў, і г.д."
+"Офі�ны� праграмы: прац��ары �ловаў (LibreOffice Writer, Kword), �лектроны� "
+"табліцы, агл�дальнікі pdf-файлаў, і г.д."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, fuzzy, c-format
 msgid "Game station"
 msgstr "�ўт�нтыфікацы�"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Забаўл�льны� праграмы: аркады, �трат�гіі і г.д."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Мульцімеды�"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Р�дактары і прайгравальнікі гуку і від�а"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "Інт�рн�т"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, 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:42
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Сеткавы прынт�р (TCP/Socket)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ці жадаеце прат��ціраваць на�тройкі?"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Кан�ольны� ін�трументальны� �родкі"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Ра�працоўка"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Дакум�нтацы�"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, fuzzy, c-format
 msgid "Web Server"
 msgstr "Сервак"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, fuzzy, c-format
 msgid "Apache"
 msgstr "Шл�х:"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "Групы"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, fuzzy, c-format
 msgid "Firewall/Router"
 msgstr "Р��тарт"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, fuzzy, c-format
 msgid "Internet gateway"
 msgstr "Інт�рн�т"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Файл/_Стварыць"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Каталог %s Так"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "NIS ��ервер:"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Ім� дамену"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Сервер друку"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "База даньн�ў"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
+msgid "PostgreSQL and MariaDB Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
+msgid "PostgreSQL or MariaDB database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Сеткавы� інт�рф�й�ы"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, fuzzy, c-format
 msgid "Graphical Environment"
 msgstr "�балонка"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "Канфігурацы�"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -586,12 +703,12 @@ msgstr ""
 "The K Desktop Environment - а�ноўнае графічнае а��родзе з калекцы�й "
 "ін�трументальных �родкаў"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "Інфармацы� аб пам�ці"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -600,66 +717,129 @@ msgstr ""
 "Графічнае а��родзе �а зручным дзел� выкары�танн� наборам прыкладанн�ў і  "
 "ін�трументальных �родкаў"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "Канфігурацы�"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Графічнае а��родзе �а зручным дзел� выкары�танн� наборам прыкладанн�ў і  "
+"ін�трументальных �родкаў"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Інфармацы� аб пам�ці"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Канфігурацы�"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "�балонка"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "Працоўны �тол"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Графічнае а��родзе �а зручным дзел� выкары�танн� наборам прыкладанн�ў і  "
+"ін�трументальных �родкаў"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Працоўны �тол"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Графічнае а��родзе �а зручным дзел� выкары�танн� наборам прыкладанн�ў і  "
 "ін�трументальных �родкаў"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Працоўны �тол"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"The K Desktop Environment - а�ноўнае графічнае а��родзе з калекцы�й "
+"ін�трументальных �родкаў"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Іншы� графічны� Працоўны� �талы"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, c-format
 msgid "Utilities"
 msgstr "Кары�на�ьці"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "NIS ��ервер:"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Прылады"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Сі�т�мнае адміні�траваньне"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Канфігурацы� �еткі"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "Ц�нтар кіраваньн�"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "�емагчыма выдаліць \"%s\": %s."
@@ -673,7 +853,7 @@ msgstr ""
 "Узнікла памылка, �кую не атрымліваецца кар�ктна апрацаваць,\n"
 "таму прац�гвайце на �ваю рызыку."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -693,333 +873,333 @@ msgstr "Пераход на крок ‛%s’\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "У�тал�ванне Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "У�тал�ванне %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> паміж �лементамі"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "У Вашай �і�т�ме маецца недахоп р��ур�аў, таму магчымы праблемы\n"
-"пры ў�тал�ванні Mageia Linux. У г�тым выпадку па�прабуйце т�к�тавую\n"
+"пры ў�тал�ванні %s. У г�тым выпадку па�прабуйце т�к�тавую\n"
 "праграму ў�тал�ванн�. Дл� г�тага наці�ніце ‛F1’ у ча� загрузкі, а потым\n"
 "наб�рыце ‛text’ і наці�ніце <ENTER>."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Выбар групы пакетаў"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "�хоўнік �крану"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "Працоўны �тол"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "Працоўны �тол"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "Працоўны �тол"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Выбар групы пакетаў"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "��абі�ты выбар пакетаў"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
+#, fuzzy, c-format
+msgid "Unselect All"
+msgstr "Дадаць выбраны� файлы"
+
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "�гульны памер: %d / %d Мб"
 
-#: steps_gtk.pm:403
-#, c-format
-msgid "Bad package"
-msgstr "Др�нны пакет"
-
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "В�р�і�: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Памер: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr ""
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, fuzzy, c-format
 msgid "Importance: "
 msgstr "важна"
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Вы не можаце вылучаць і адм�н�ць вылуч�нне г�тага пакету"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "Ула�ьціва�ьці акна"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Вы не можаце выбраць г�ты пакет, таму �к не хапае ме�ца дл� �го ў�тал�ванн�"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "�а�тупны� пакеты будуць даданы да �і�т�мы"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "�а�тупны� пакеты будуць выдалены"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Г�та абав�зковы пакет, �го вылуч�нне нельга адм�ніць"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Вы не можаце адм�ніць вылуч�нне г�тага пакету. �н ужо ў�тал�ваны"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Вы не можаце адм�ніць вылуч�нне г�тага пакету. Яго патр�бна абнавіць"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "У�талёўка"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "Перане�ьці вылуч�ньне"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, fuzzy, c-format
 msgid "Updating package selection"
 msgstr "��абі�ты выбар пакетаў"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, fuzzy, c-format
 msgid "Minimal install"
 msgstr "�хоўнік �крану"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, fuzzy, c-format
 msgid "Software Management"
 msgstr "М�н�дж�р ��рві�аў"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Выбар пакетаў дл� ў�тал�ванн�"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "У�талёўваем"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, fuzzy, c-format
 msgid "No details"
 msgstr "Падраб�зна�ці"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "За�тало�� ча�у "
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Чакаецца"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d пакетаў"
 msgstr[1] "%d пакетаў"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "�гульны� зьве�ткі"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "�а�тройка"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "�а�троіць пан�ль"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Выбар групы пакетаў"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "�дбыла�� памылка"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, fuzzy, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Калі ла�ка, аб�рыце тып клаві�туры"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, fuzzy, c-format
 msgid "Install/Upgrade"
 msgstr "У�талёўваем"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "У�талёўка"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr ""
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "У�талёўваем"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1028,32 +1208,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "�а�тройка IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, fuzzy, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1068,158 +1233,182 @@ msgstr ""
 "Калі вы не маеце �го, наці�ніце �дм�ніць, каб адм�ніць у�тал�ванне з г�тага "
 "Cd."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Прагл�д да�тупных пакетаў"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Загрузка"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Захаваць"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Загрузка файла"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Выбар групы пакетаў"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "У�тал�ванне пакету %s"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Падрыхтоўка загрузчыка"
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Падрыхтоўка ў�тал�ваньн�"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "У�тал�ванне пакету %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "�трымала�� памылка ўпарадкаванн� пакетаў:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "У�ё роўна прац�гваць?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "�днавіць"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "��абі�ты выбар пакетаў"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "�трымала�� памылка ўпарадкаванн� пакетаў:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "�а�тройка па�л� ў�тал�ванн�"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, fuzzy, c-format
 msgid "Updates"
 msgstr "�днавіць"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1232,121 +1421,114 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "�б�тал�ваньне"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, fuzzy, c-format
 msgid "Sound card"
 msgstr "Праграма гуказапі�у"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, fuzzy, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Ці ё�ць у ва� іншы?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, fuzzy, c-format
 msgid "Graphical interface"
 msgstr "Запу�к X пры �тарце �і�т�мы"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, fuzzy, c-format
 msgid "Network & Internet"
 msgstr "Сеткавы інт�рфей�"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Прок�і"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, fuzzy, c-format
 msgid "configured"
 msgstr "�а�троіць пан�ль"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Узровень б��ьпекі"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "выключаны"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, fuzzy, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Меню не было захавана. Ці �апраўды вы жадаеце вый�ці?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Падрыхтоўка загрузчыка"
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Падрыхтоўка ў�тал�ваньн�"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "У�таўце ды�кету ў ды�кавод %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Ствар�нне ды�кеты дл� ў�тал�ванн�"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1356,12 +1538,12 @@ msgstr ""
 "�екаторы� крокі не завершаны.\n"
 "Вы �апраўды жадаеце вый�ці зараз?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, fuzzy, c-format
 msgid "Congratulations"
 msgstr "Прыміце віншаванні!"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Перазагрузка"
@@ -1456,13 +1638,6 @@ msgid ""
 "Users"
 msgstr "Кары�тальнікі"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr ""
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1505,6 +1680,35 @@ msgid ""
 "Exit"
 msgstr "Выход"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Падрыхтоўка загрузчыка"
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Графічнае а��родзе �а зручным дзел� выкары�танн� наборам прыкладанн�ў і  "
+#~ "ін�трументальных �родкаў"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Працоўны �тол"
+
+#~ msgid "Welcome"
+#~ msgstr "Вітаем"
+
+#, fuzzy
+#~ msgid "Select All"
+#~ msgstr "�б�рыце файл"
+
+#~ msgid "Bad package"
+#~ msgstr "Др�нны пакет"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Падрыхтоўка загрузчыка"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
diff --git a/perl-install/install/share/po/bg.po b/perl-install/install/share/po/bg.po
index 8d849b724..f0c0f4349 100644
--- a/perl-install/install/share/po/bg.po
+++ b/perl-install/install/share/po/bg.po
@@ -1,60 +1,84 @@
-# translation of DrakX-bg.po to Bulgarian
-# Copyright (C) 2000,2003 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandriva
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-#
-# Bozhan Boiadzhiev <bozhan@plov.omega.bg>, 2000.
-# Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>, 2003.
-# Boyan Ivanov <boyan17@bulgaria.com>, 2003.
-# Kolio Kolev <kolio_kolev@biotronica.net>, 2009.
+# Translators:
+# Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>, 2003
+# Boyan Ivanov <boyan17@bulgaria.com>, 2003
+# Bozhan Boiadzhiev <bozhan@plov.omega.bg>, 2000
+# Kolio Kolev <kolio_kolev@biotronica.net>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-bg\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+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-"
-"bg@googlegroups.com>>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 04:07+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/MageiaLinux/mageia/"
+"language/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.3\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr ""
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Home entertainment"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "For kids"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "For family!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "For developers!"
 msgstr ""
 
-#: any.pm:109
-#, fuzzy, c-format
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
+#, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Имате ли друг(и) ?"
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -63,116 +87,179 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
-#, fuzzy, c-format
+#: any.pm:163
+#, c-format
 msgid "Network (HTTP)"
-msgstr "Мрежа %s"
+msgstr ""
 
-#: any.pm:122
-#, fuzzy, c-format
+#: any.pm:164
+#, c-format
 msgid "Network (FTP)"
-msgstr "Мрежа %s"
+msgstr ""
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Свързване � Mageia Linux web �айт за получаване на �пи�ъка � налични "
-"огледални �ървъри..."
+"Свързване � %s web �айт за получаване на �пи�ъка � налични огледални "
+"�ървъри..."
 
-#: any.pm:187
-#, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+#: any.pm:253
+#, c-format
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Свързване � Mageia Linux web �айт за получаване на �пи�ъка � налични "
-"огледални �ървъри..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Изберете огледален �ървър,от който да получите пакетите"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Директори�"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
-#, fuzzy, c-format
+#: any.pm:369
+#, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
-msgstr "�е мога да намер� %s на %s"
+msgstr ""
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Тър�и във вече ин�талираните пакети..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Тър�� пакети за обнов�ване"
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -186,87 +273,87 @@ msgstr ""
 "\n"
 "Дей�твително ли и�кате да изтриете тези пакети?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Грешка при четенето на файла %s"
 
-#: any.pm:1020
-#, fuzzy, c-format
+#: any.pm:1304
+#, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "Следните пакети ще тр�бва да �е ин�талират:\n"
+msgstr ""
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Мрежа"
 
-#: any.pm:1102
-#, fuzzy, c-format
+#: any.pm:1386
+#, c-format
 msgid "Please choose a media"
-msgstr "Мол� изберете"
+msgstr ""
 
-#: any.pm:1118
-#, fuzzy, c-format
+#: any.pm:1402
+#, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "Файлът �ъще�твува. Да бъде ли презапи�ан?"
+msgstr ""
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Ли�ват права"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
-#, fuzzy, c-format
+#: any.pm:1475
+#, c-format
 msgid "Bad media %s"
-msgstr "добавен източник %s"
+msgstr ""
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "�е мога да направ� моментна \"�нимка\" преди раздел�нето на ди�ка "
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Снимки ще бъдат налични �лед ин�талиране в %s"
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
-msgstr "Ин�талирам"
+msgstr ""
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "�а�тройка"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Вие тр�бва �ъщо да форматирате %s"
@@ -291,25 +378,25 @@ msgstr "Включвам мрежата"
 msgid "Bringing down the network"
 msgstr "Изключване на мрежата"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
-#, fuzzy, c-format
+#: media.pm:805
+#, c-format
 msgid "Copying in progress"
-msgstr "Откриване в прогре�"
+msgstr "Копиране в прогре�"
 
 #: pkgs.pm:32
 #, c-format
@@ -336,268 +423,291 @@ msgstr "добър"
 msgid "maybe"
 msgstr "�тава"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Без опи�ание"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "По�ви �е грешка"
+msgstr ""
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Получи �е непоправима грешка: %s"
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Без въпро�и отново"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d ин�талационни транзакции пропаднаха"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "Ин�талиране на пакета %s"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Работна �танци�"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Офи�на работна �танци�"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Офи� програми: word-проце�ори (OpenOffice.org Writer, Kword), таблици "
-"(OpenOffice.org Calc, Kspread), преглед на PDF, и т.н."
+"Офи� програми: word-проце�ори (LibreOffice Writer, Kword), таблици "
+"(LibreOffice Calc, Kspread), преглед на PDF, и т.н."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Игрална �танци�"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Забавни програми: аркадни игри, игри на ма�а, �тратегии и т.н."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Мутимедийна �танци�"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Програми за пу�кане/поправ�не на звук и видео"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Интернет �танци�"
 
-#: share/meta-task/compssUsers.pl:33
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:37
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
-"�абор от ин�трументи за четене и изпращане на поща и новини (pine, mutt, "
-"tin..) и за обикал�не из Мрежата"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Мрежов компютър (клиент)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клиенти за различни протоколи включително SSH"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ин�трументи за уле�н�ване на�тройката на компютъра ви"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Конзолни ин�трументи"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Разработка"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Документаци�"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Web Сървър"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Групуер"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Сървър"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Сървър, Firewall/Рутер"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Интернет gateway"
 
-#: share/meta-task/compssUsers.pl:84
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:92
+#, c-format
 msgid "Mail/News"
-msgstr "/Файл/_�ов"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:85
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:93
+#, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Postfix пощен�ки �ървър"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Сървър � директории"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP �ървър"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:107
+#, c-format
 msgid "DNS/NIS"
-msgstr "FND/NIS"
+msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Име на домейн и Мрежов Информационен Сървър"
 
-#: share/meta-task/compssUsers.pl:100
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:112
+#, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Сървър на принтера"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:101
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:113
+#, c-format
 msgid "NFS Server, Samba server"
-msgstr "Samba Сървър"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Сървър, Бази-данни"
 
-#: share/meta-task/compssUsers.pl:105
-#, fuzzy, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL или MySQL �ървър за бази-данни"
+#: share/meta-task/compssUsers.pl:118
+#, c-format
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Сървър, Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache и Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Е-поща"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix пощен�ки �ървър"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL или MySQL �ървър за бази-данни"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL или MariaDB �ървър за бази-данни"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Мрежов компютър, �ървър"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Графична �реда"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE работна �танци�"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -606,12 +716,12 @@ msgstr ""
 "The K Desktop Environment, про�та �реда � колекци� от придружаващи "
 "ин�трументи"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome работна �танци�"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -619,68 +729,124 @@ msgid ""
 msgstr ""
 "Графична �реда � потребител�ки набор от приложени� и desktop ин�трументи"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "на�толен компютър"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Графична �реда � потребител�ки набор от приложени� и desktop ин�трументи"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Други графични desktop-и"
 
-#: share/meta-task/compssUsers.pl:150
-#, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm и т.н."
+#: share/meta-task/compssUsers.pl:200
+#, c-format
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Помощни програми"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Сървър"
 
-#: share/meta-task/compssUsers.pl:180
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:230
+#, c-format
 msgid "Webmin"
-msgstr "Webmin Об�лужване"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:181
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:231
+#, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Конфигураци� на Терминален Сървър в Mageia Linux"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:185
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:235
+#, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Мониторинг на мрежата"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:240
+#, c-format
 msgid "Mageia Wizards"
-msgstr "Контролен център на Mageia Linux"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:191
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:241
+#, c-format
 msgid "Wizards to configure server"
-msgstr "��еу�пешна на�тройка на принтер \"%s\"!"
+msgstr ""
 
 #: steps.pm:85
 #, c-format
@@ -691,7 +857,7 @@ msgstr ""
 "По�ви �е грешка, но не знам как да �е �прав� � не� деликатно.\n"
 "Можете да продължите на �вой ри�к."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -711,334 +877,333 @@ msgstr "�авлизам в етап `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Ин�талаци� на Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Ин�талаци� на %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> между елементите"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Вашата �и�тема е � малки ре�ур�и. Може да имате проблеми � ин�талирането\n"
-"на Mageia Linux. �ко �е по�ви проблем опитайте � тек�товата ин�алаци�. "
-"Зацелта,\n"
+"на %s. �ко �е по�ви проблем опитайте � тек�товата ин�алаци�. Зацелта,\n"
 "нати�нете 'F1', когато �тартирате от CDROM и въведете 'теьт'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Media Selection"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr ""
+
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "Миминална ин�талаци�"
+msgstr ""
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "на�толен компютър"
+msgstr ""
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "на�толен компютър"
+msgstr ""
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "на�толен компютър"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Избор на група пакети"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Избиране на пакети един по един"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Обща големина: %d / %d MB"
+msgid "Unselect All"
+msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Лош пакет"
+msgid "Total size: %d / %d MB"
+msgstr "Обща големина: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Вер�и�: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Размер: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d КБ\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Важно�т:"
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "�е можете да отбележете/деотбележете този пакет"
 
-#: steps_gtk.pm:445
-#, fuzzy, c-format
+#: steps_gtk.pm:462
+#, c-format
 msgid "due to missing %s"
-msgstr "лип�ва kdesu"
+msgstr ""
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "поради неопределен %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "�е можете да о�тавите пакета немаркиран, защото н�мате м��то да го "
 "ин�талирате"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Следните пакети ще бъдат ин�талирани"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Следните пакети ще бъдат премахнати"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Това е нужен пакет, не може да бъде немаркиран"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "�е можете да о�тавите този пакет немаркиран. Той вече е ин�талиран"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "�е можете да изключите този пакет. Той тр�бва да бъде обновен"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Покажи автоматично отбел�заните пакети"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Ин�талирай"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Прочитане/Запи� на направени� избор"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Обнов�ване на избора на пакети"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Миминална ин�талаци�"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Управление на �офтуер"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Изберете пакетите, които и�кате да ин�талирате"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Ин�талирам"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Без подробно�ти"
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "О�таващо време "
+msgstr ""
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "Пре�м�тане"
+msgstr ""
 
-#: steps_gtk.pm:615
-#, fuzzy, c-format
+#: steps_gtk.pm:631
+#, c-format
 msgid "%d package"
 msgid_plural "%d packages"
-msgstr[0] "%d пакета"
-msgstr[1] "%d пакета"
+msgstr[0] ""
+msgstr[1] ""
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Обобщение"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "�а�тройка"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "не е конфигуриран"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Избор на група пакети"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "По�ви �е грешка"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Мол�, изберете подреждане на клавиатурата"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "Ето пълен �пи�ък на до�тръпните �трани"
+msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Ин�талирай/Обнови"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Това нова ин�талаци� ли е или обнов�ване ?"
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
-msgstr "Ин�талирай"
+msgstr "Ин�талиране"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Обнов�ва %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Ключ за криптиране на %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "Ин�талирам"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1047,119 +1212,90 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "�а�тройка на IDE"
 
-#: steps_interactive.pm:290
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"��ма �вободно м��то за 1 МБ �тартиращо поле ! Ин�талаци�та ще продължи, но, "
-"за да �тартирате �и�темата �и, ще тр�бва да �ъздадете �тартиращо поле в "
-"DiskDrake"
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"��ма �вободно м��то за 1 МБ �тартиращо поле ! Ин�талаци�та ще продължи, но, "
-"за да �тартирате �и�темата �и, ще тр�бва да �ъздадете �тартиращо поле в "
-"DiskDrake"
-
-#: steps_interactive.pm:371
-#, fuzzy, c-format
-msgid ""
 "Change your Cd-Rom!\n"
 "Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
 "done.\n"
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
-"Сменете CD-ROM !\n"
-"\n"
-"Мол�, �ложете CD-ROM озаглавен \"%s\" в у�трой�твото и нати�нете Ok, когато "
-"�те готови.\n"
-"�ко го н�мате, нати�нете Отм�на, за да избегнете ин�талирането от този CD-"
-"ROM."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Тър�� налични пакети..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
-#, fuzzy, c-format
+#: steps_interactive.pm:428
+#, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"Може изберете зареждане или запи� на избора на пакети на флопи.\n"
-"Форматът е �ъщи�т като auto_install генерираните ди�кети."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "�атоварено�т"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Запазва"
 
-#: steps_interactive.pm:453
-#, fuzzy, c-format
+#: steps_interactive.pm:438
+#, c-format
 msgid "Bad file"
-msgstr "Зареждане на файл"
+msgstr ""
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "Избор на група пакети"
+msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Избраната големина е по-гол�ма от до�тъпното про�тран�тво"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Тип ин�талаци�"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1168,87 +1304,111 @@ msgstr ""
 "Вие не �те избрали никаква група от пакети.\n"
 "Мол�, изберете минималната ин�талаци� ко�ти и�кате:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "С X"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Ин�талиране на пакета %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "С базова документаци� (препоръчва �е!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "�аи�тина минимална ин�талаци� (о�обенно без urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Подготв�м ин�талаци�та"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Ин�талиране на пакета %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "По�ви �е грешка при поръчването на пакетите:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Да продължа ли в�е пак ?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Повторен опит"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
-#, fuzzy, c-format
+#: steps_interactive.pm:682
+#, c-format
 msgid "Go back to media and packages selection"
-msgstr "Запази избор на пакети"
+msgstr ""
 
-#: steps_interactive.pm:683
-#, fuzzy, c-format
+#: steps_interactive.pm:685
+#, c-format
 msgid "There was an error installing package %s."
-msgstr "По�ви �е грешка при ин�талиране на пакетите:"
+msgstr ""
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "След ин�талационна на�тройка"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Обнов�ване"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1261,127 +1421,114 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Хардуер"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Звукова карта"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Имате ли ISA звукова карта?"
 
-#: steps_interactive.pm:921
-#, fuzzy, c-format
+#: steps_interactive.pm:931
+#, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
-"Изпълнете \"sndconfig\" �лед ин�талаци� за да конфигурирате вашата звукова "
-"карта"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "��ма открита звукова карта. Опитайте \"harddrake\" �лед ин�талаци�та"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Графичен интерфай�"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Мрежа и интернет"
 
-#: steps_interactive.pm:949
-#, fuzzy, c-format
+#: steps_interactive.pm:960
+#, c-format
 msgid "Proxies"
-msgstr "Профил "
+msgstr ""
 
-#: steps_interactive.pm:950
-#, fuzzy, c-format
+#: steps_interactive.pm:961
+#, c-format
 msgid "configured"
-msgstr "прена�тройка"
+msgstr ""
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "�иво на защита"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Защитна �тена"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "активирано"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "изключен"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Вие не �те конфигурирали X. Сигурни ли �те, че и�кате това?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Подготовка на bootloader"
+msgid "Preparing initial startup program..."
+msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, fuzzy, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Изглежда имате �тароврем�ка или неизве�тна\n"
-"машина, на ко�то yaboot н�ма да проработи.\n"
-"Ин�талаци�та ще продължи, но ще тр�бва\n"
-"да иползвате BootX, за да �тартирате машината �и"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Сложете празна ди�кета в у�трой�тво %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Подготв�м ди�кета � автоматична ин�талаци�"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1392,12 +1539,12 @@ msgstr ""
 "\n"
 "�аи�тина ли и�кате да излезете �ега ?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Поздравлени�"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Пре�тартира"
@@ -1413,7 +1560,7 @@ msgstr "Избор на език"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "Регионални на�тройки (локализаци�)"
 
 #: steps_list.pm:17
 #, c-format
@@ -1492,13 +1639,6 @@ msgid ""
 "Users"
 msgstr "Потребители"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Мрежа"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1540,142 +1680,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Излез"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Офи� програми: word-проце�ори (kword, abiword), таблици (kspread, "
-#~ "gnumeric), преглед на PDF, и т.н."
-
-#, fuzzy
-#~ msgid "Downloading file %s..."
-#~ msgstr "Изпращам файлове..."
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Избрали �те �ледни�(те) �ървър(и): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Тези �ървъри �е активират по подразбиране. Те н�мат изве�тни проблеми "
-#~ "�ъ�\n"
-#~ "�игурно�тта, но може да �е намер�т нови. В този �лучай, ще тр�бва да �те\n"
-#~ "�игурни, че ще надграждате възможно най-бързо.\n"
-#~ "\n"
-#~ "\n"
-#~ "�аи�тина ли и�кате да ин�талирате тези �ървъри ?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "IceWm графична �реда"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "Свързване � огледални� �ървър за получаване на �пи�ъка � пакетите"
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "�е мога да �е �връжа � огледален �ървър' %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Подготви ди�кета за автоматична ин�талаци�"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "�втоматичната ин�талаци� може да бъде напълно автоматизирана,\n"
-#~ "в такъв �лучай ще превземе твърди� ви ди�к !!!\n"
-#~ "(това е за предназначено за ин�талиране на друга машина).\n"
-#~ "\n"
-#~ "Може би и�кате да повторите ин�талаци�та.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Повтори"
-
-#~ msgid "Automated"
-#~ msgstr "�втоматизиран"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Запази избор на пакети"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "И�кате ли да използвате aboot ?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Грешка при ин�талиране на aboot, \n"
-#~ "да �е опитам ли да продължа ин�талаци�та дори, ако това унижтожи първи� "
-#~ "д�л ?"
-
-#~ msgid "All"
-#~ msgstr "В�ички"
-
-#~ msgid "TV card"
-#~ msgstr "TV карта"
-
-#~ msgid "Boot"
-#~ msgstr "Зареждане"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Идентификаци�"
-
-#, fuzzy
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "%d пакета"
-#~ msgstr[1] "%d пакета"
-
-#~ msgid "%d packages"
-#~ msgstr "%d пакета"
-
-#~ msgid "Language"
-#~ msgstr "Избор на език"
-
-#~ msgid "License"
-#~ msgstr "Лиценз"
-
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "Избор на кла� ин�талаци�"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "Пре�м�тане"
-
-#, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "Пакети за ин�талиране"
-
-#~ msgid "Users"
-#~ msgstr "Потребители"
-
-#~ msgid "Networking"
-#~ msgstr "Мрежи"
-
-#~ msgid "Configure X"
-#~ msgstr "�а�тройка на Х"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "��мам до�тъп да модулите на �дрото �ъответ�тващи на ваши�т (файл %s "
-#~ "лип�ва), това означава, че вашето флопи не е �инхронизирано � "
-#~ "ин�талационни�т но�ител (мол� направете ново boot флопи)"
diff --git a/perl-install/install/share/po/bn.po b/perl-install/install/share/po/bn.po
index 8d067b4a2..ba28fead6 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: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+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"
@@ -20,38 +20,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "অফিস ওয়ার�কষ�টেশন"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Thank you!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Be Free!"
 msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "আপনার কি আরও �কটি সম�প�রক মাধ�যম আছে?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -64,112 +89,177 @@ msgstr ""
 "\n"
 "আপনার কি কনফিগার করার জন�য কোনো সম�প�রক ইনস�টলেশন মিডিয়াম আছে?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "সিডি-রম"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "নেটওয়ার�ক (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "নেটওয়ার�ক (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "নেটওয়ার�ক (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "mirror �র ইউ-আর-�ল?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "ইউআর�ল অবশ�যই ftp:// অথবা http:// দিয়ে শ�র� হবে"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "উপস�থিত মিররের তালিকার জন�য Mageia Linux-� সংয�ক�ত করা হচ�ছে..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "উপস�থিত মিররের তালিকার জন�য %s-� সংয�ক�ত করা হচ�ছে..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr "উপস�থিত মিররের তালিকার জন�য Mageia Linux-� যোগাযোগ করতে ব�যর�থ হয়েছে..."
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr "উপস�থিত মিররের তালিকার জন�য %s-� যোগাযোগ করতে ব�যর�থ হয়েছে..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "আপনি �কটি মিরর পছন�দ কর�ন যেখান থেকে প�যাকেজগ�লি নেবেন"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS সেটআপ"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "অন�গ�রহ করে আপনার NFS মিডিয়ার হোস�টনাম �বং ডিরেক�টরী প�রবেশ করান"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "হোস�টনাম পাওয়া যাচ�ছে না"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "ডিরেক�টরী অবশ�যই \"/\" দিয়ে শ�র� হবে"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS মাউন�টের জন�য হোস�টনাম ?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "ডিরেক�টরি"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "সম�প�রক"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "�ই mirror � কোন hdlist ফাইল পাওয়া যাচ�ছে না"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, fuzzy, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "\"%s\" মাধ�যমের সব প�যাকেজ �ড়িয়ে যাও"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "যে সমস�থ প�যাকেজ ইনস�টল হয়ে আছে সেগ�লি পর�যবেক�ষন করা হচ�ছে..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "আপগ�রেড করার জন�য প�যাকেজ খো�জা হচ�ছে..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -182,87 +272,87 @@ msgstr ""
 "\n"
 "আপনি কি আসলেই �ই প�যাকেজগ�লো ম�ছে ফেলতে চান?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s ফাইল পড়াতে ত�র�টি"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "নিম�নলিখিত ডিস�কগ�লো নামান�তর করা হয়েছে:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (পূর�বের নাম %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "�ইচ-টি-টি-পি"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "�ফ-টি-পি"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "নেটওয়ার�ক"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "অন�গ�রহ করে �কটি মিডিয়া নির�বাচন কর�ন"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "�ই ফাইলটি আগে থেকেই আছে। করব?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "অন�মতি প�রদান করা হয়নি"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "ত�র�টিপূর�ণ NFS নাম"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "অগ�রহণযোগ�য মিডিয়া %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "পার�টিশন করার আগে স�ক�রিনশট তৈরী করা যায়নি"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "%s -� ইনস�টল করার পরে স�ক�রিনশট পাওয়া যাবে"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr " ইনস�টলেশন"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "কনফিগারেশন"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "আপনাকে অবশ�যই %s-ও ফরম�যাট করতে হবে"
@@ -286,22 +376,22 @@ msgstr "নেটওয়ার�ককে চাল� করা হচ�ছে
 msgid "Bringing down the network"
 msgstr "নেটওয়ার�ককে বন�ধ করা হচ�ছে"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "ভবিষ�যতে ব�যবহারের জন�য ডিস�কে কিছ� প�যাকেজ কপি করা হচ�ছে"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "কপি সম�পন�ন হচ�ছে"
@@ -331,73 +421,98 @@ msgstr "স�ন�দর"
 msgid "maybe"
 msgstr "হয়তোবা"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "বিবরণ নেই"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "�কটি ত�র�টি সম�পাদিত হয়েছে"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "�কটি মারাত�মক ত�র�টি ঘটেছে: %s"
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "ইনস�টলেশন বিফল হয়েছে"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "%s প�যাকেজ সমূহ ইনস�টল করা হচ�ছে"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "ওয়ার�কষ�টেশন"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "অফিস ওয়ার�কষ�টেশন"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"অফিস প�রোগ�রামসমূহ: ওয়ার�ডপ�রসেসর (OpenOffice.org Writer, Kword), স�প�রেডসিট "
-"(OpenOffice.org Calc, Kspread), PDF ফাইল প�রদর�শক ইত�যাদী"
+"অফিস প�রোগ�রামসমূহ: ওয়ার�ডপ�রসেসর (LibreOffice Writer, Kword), স�প�রেডসিট "
+"(LibreOffice Calc, Kspread), PDF ফাইল প�রদর�শক ইত�যাদী"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "গেশ ষ�টেশন"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "উদ�দীপনামূলক প�রোগ�রামসমূহ: আর�কেড, বোর�ড, স�ট�রেটেজি, ইত�যাদি"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "মাল�টিমিডিয়া ষ�টেশন"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "সাউন�ড �বং ভিডিও দেখার/�ডিট করার প�রোগ�রামসমূহ"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "ইন�টারনেট ষ�টেশন"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -405,205 +520,205 @@ msgid ""
 msgstr ""
 "মেইল আদানপ�রদান, খবর পড়া �বং ওয়েব ব�রাউজিং (mutt, tin..) �র জন�য কিছ� ট�লের সেট"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "নেটওয়ার�ক কম�পিউটার (ক�লাইন�ট)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "SSH সহ বিভিন�ন প�রোটকলের জন�য ক�লাইন�টসমূহ"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "আপনার কম�পিউটারের কনফিগারেশন সহজ করার জন�য কিছ� ট�ল"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "কনসল ট�ল"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "ডেভলপমেন�ট"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "ডক�মেন�টেশন"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "লিনাক�সের সাধারণ আধার। তৃতীয়পক�ষ �প�লিকেশন সমূহের সাপোর�ট"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "ওয়েব সার�ভার"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "��যপাচি"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "গ�র�পওয়�যার"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "কোলাব সার�ভার"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "ফায়ারওয়াল/রাউটার"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "ইন�টারনেট গেটওয়ে"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "মেইল/সংবাদ"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix মেইল সার�ভার, Inn সংবাদ সার�ভার"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "ডিরেক�টরি সার�ভার"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP সার�ভার"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "ডি�ন�স/�নআই�স"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "ডোমেইন নেম �বং নেটওয়ার�ক ইনফরমেশন সার�ভার"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "ফাইল �বং প�রিন�টার শেয়ারিং সার�ভার"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "ডেটাবেস"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL অথবা MySQL ডেটাবেস সার�ভার"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL অথবা MariaDB ডেটাবেস সার�ভার"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "ওয়েব/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "��যপাচি, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "মেইল"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix মেইল সার�ভার"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL অথবা MySQL ডেটাবেস সার�ভার"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL অথবা MariaDB ডেটাবেস সার�ভার"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "নেটওয়ার�ক কম�পিউটার সার�ভার"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "গ�রাফিকাল পরিবেশ"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE ওয়ার�কষ�টেশন"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "গ�হনোম ওয়ার�কষ�টেশন"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -611,65 +726,124 @@ msgid ""
 msgstr ""
 "ব�যবহারকারীর বন�ধ�সূলভ কিছ� �প�লিকেশন �বং ডোক�সটপ ট�লের সমন�বয়ে �কটি গ�রাফিকাল পরিবেশ"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE ওয়ার�কষ�টেশন"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"ব�যবহারকারীর বন�ধ�সূলভ কিছ� �প�লিকেশন �বং ডোক�সটপ ট�লের সমন�বয়ে �কটি গ�রাফিকাল পরিবেশ"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "গ�হনোম ওয়ার�কষ�টেশন"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "ওয়ার�কষ�টেশন"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "গ�রাফিকাল পরিবেশ"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "IceWm ডেস�কটপ"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"ব�যবহারকারীর বন�ধ�সূলভ কিছ� �প�লিকেশন �বং ডোক�সটপ ট�লের সমন�বয়ে �কটি গ�রাফিকাল পরিবেশ"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "IceWm ডেস�কটপ"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "ব�যবহারকারীর বন�ধ�সূলভ কিছ� �প�লিকেশন �বং ডোক�সটপ ট�লের সমন�বয়ে �কটি গ�রাফিকাল পরিবেশ"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "IceWm ডেস�কটপ"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "K ডেক�সটপ, কিছ� সহযোগীমূলক ট�লের সমন�বয়ে �কটি সাধারণ গ�রাফিকাল পরিবেশ"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "অন�যান�য গ�রাফিকাল ডেক�সটপ"
 
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:200
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, ইত�যাদি"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "ইউটিলিটিসমূহ"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH সার�ভিস"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "ওয়েবমিন"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "ওয়েবমিন দূরবর�তী কনফিগারেশন সার�ভার"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "নেটওয়ার�ক ইউটিলিটিসমূহ/পর�যবেক�ষণ"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "পর�যবেক�ষণ ট�লসমূহ, হিসাবরক�ষণ প�রসেস করে, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia উইজার�ডসমূহ"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "সার�ভার কনফিগার করার জন�য উইজার�ডসমূহ"
@@ -684,7 +858,7 @@ msgstr ""
 "কিভাবে �টা সন�দরভাবে হ�যান�ডল করবো।\n"
 "আপনি নিজের ���কিতে অগ�রসর হতে পারেন।"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -704,24 +878,24 @@ msgstr "`%s' স�টেপে প�রবেশ করছি\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux ইনস�টলেশন %s"
+msgid "%s Installation %s"
+msgstr "%s ইনস�টলেশন %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "উপাদানগ�লোর মধ�যে <Tab>/<Alt-Tab> "
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
-#, c-format
+#: steps_gtk.pm:212
+#, fuzzy, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "আপনার সিস�টেমের রিসোর�স খ�ব কম। ম�যান�ড�রিব লিনাক�স ইনস�টল করার সময় আপনি সমস�যার "
@@ -730,229 +904,229 @@ msgstr ""
 "জন�য,\n"
 "যখন সিডিরম থেকে ব�ট হবে তখন `F1' চাপ�ন, তারপর `text' লিখ�ন।"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "প�যাকেজ গ�র�প নির�বাচন"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "সর�বনিম�ন ইনস�টল"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "IceWm ডেস�কটপ"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "IceWm ডেস�কটপ"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "IceWm ডেস�কটপ"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "প�যাকেজ গ�র�প নির�বাচন"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "আলাদাভাবে প�যাকেজ নির�বাচন"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "মোট সাইজ: %d / %d �মবি"
+msgid "Unselect All"
+msgstr "সব কিছ� অনির�বাচিতকরণ"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "বাজে প�যাকেজ"
+msgid "Total size: %d / %d MB"
+msgstr "মোট সাইজ: %d / %d �মবি"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "ভার�সন:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "সাইজ:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "প�রাধান�য:"
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "আপনি �ই প�যাকেজটি নির�বাচন/অ-নির�বাচন করতে পারবেন না"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s না থাকার কারনে"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s যথেষ�ট না হবার কারনে"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s প�রচারের চেষ�টা চলছে"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s রাখার কারণে"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "আপনি �ই প�যাকেজটি নির�বাচন করতে পারবেননা যেহেত� �টা ইনস�টল করার জন�য যথেষ�ট জায়গা "
 "ফা�কা নেই"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "�ই প�যাকেজগ�লি ইনস�টল হতে যাচ�ছে"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "�ই প�যাকেজগ�লি অপসরিত হতে যাচ�ছে"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "�টি �কটি বাধ�যতামূলাক প�যাকেজ, �টি কোনভাবেই বাদ দেয়া যাবেনা"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr ""
 "আপনি �ই প�যাকেজটির অ-নির�বাচন করতে পারবেন না, �টা আগে থেকেই ইনস�টল হয়ে আছে"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "আপনি �ই প�যাকেজটি অ-নির�বাচন করতে পারবেন না। �টা অবশ�যই আপগ�রেড হতে হবে"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "সংয়-নির�বাচিত প�যাকেজগ�লি দেখাও"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "ইনস�টল"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "নির�বাচনসমূহ লোড/সংরক�ষণ করো"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "প�যাকেজের নির�বাচন আপগ�রেড করা হচ�ছে"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "সর�বনিম�ন ইনস�টল"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "সফটওয়�যার ম�যানেজমেন�ট"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "আপনি যেই প�যাকেজগ�লি ইনস�টল করতে চান তা পছন�দ কর�ন"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "ইনস�টলেশন"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "কোন বিস�তারিত ছাড়া"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "সময় বাকী আছে"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "নির�ধারণ চলছে"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d প�যাকেজ সমূহ"
 msgstr[1] "%d প�যাকেজ সমূহ"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "সারাংশ"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "কনফিগার"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "কনফিগার করা হয়নি"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "প�যাকেজ গ�র�প নির�বাচন"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -961,84 +1135,84 @@ msgstr ""
 "নিম�নলিখিত ইনস�টলেশন মিডিয়া পাওয়া গেছে।\n"
 "যদি আপনি �গ�লোর মধ�যকার কিছ� �ড়িয়ে যেতে চান, তাহলে �খন সেগ�লোকে অনির�বাচিত কর�ন।"
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "ইনস�টলেশনের আগে আপ‌নি সিডির তথ�যসমূহ হার�ডডিস�কে কপি করতে পারেন।\n"
 " �রপর হার�ডডিস�ক থেকে ইনস�টলেশন চলতে থাকবে �বং সিস�টেম সম�পূর�ন ইনস�টলেশনের পরও "
 "প�যাকেজগ�লো রয়ে যাবে।"
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "CD গ�লো সম�প�র�ন কপি করো "
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "�কটি ত�র�টি সম�পাদিত হয়েছে"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "অন�গ�রহ করে আপনার কীবোর�ড বিন�যাস পছন�দ কর�ন।"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "�খানে উপস�থিত সমস�ত কীবোর�ডের তালিকা রয়োছে"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "ইনস�টল/আপগ�রড"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "�টা কি �কটি ইনস�টলেশন না আপগ�রেড?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "ইনস�টল"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s আপগ�রড করো"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s -�র জন�য �নক�রিপশন কী"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr " ইনস�টলেশন"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1047,36 +1221,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE কনফিগারেশন চলছে"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"১ মেগাবাইটের bootstrap �র জন�য খালি জায়গা নেই! ইনস�টল অগ�রসর হবে, কিন�ত� আপনার "
-"সিস�টেম ব�ট করার জন�য, আপনাকে DiskDrake থেকে bootstrap পার�টিশন তৈরী করতে হবে"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"আপনাকে �কটি PPC PReP Boot ব�টস�ট�র�যাপ তৈরী করতে হবে! ইনস�টলেশন অগ�রসর হবে, তবে "
-"আপনার সিস�টেম ব�ট করার জন�য, DiskDrake �র ব�টস�ট�র�যাপ পার�টিশনটি প�রয়োজন"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1089,12 +1244,12 @@ msgstr ""
 "ঠিক আছে চাপ�ন।\n"
 "যদি সেটা আপনার না থাকে, �ই সিডিরম থেকে ইনস�টলেশন �ড়িয়ে যেতে বাতিল চাপ�ন।"
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "বরাদ�দকৃত প�যাকেজসমূহ খো�জা হচ�ছে..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1103,7 +1258,7 @@ msgstr ""
 "ইনস�টলেশন অথবা সাম�প�রতিকীকরনের জন�য আপনার সিস�টেমে যথেষ�ট পরিমান জায়গা খালি নেই "
 "(%d�মবি > %d�মবি)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1112,52 +1267,52 @@ msgstr ""
 "অন�গ�রহ করে প�যাকেজ নির�বাচন লোড বা সংরক�ষণ বাছাই কর�ন।\n"
 "�ই ফরম�যাটটি auto_install দ�বারা তৈরী ফাইলসমূহের মত।"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "চাপ"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "সংরক�ষণ"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "অগ�রহণযোগ�য ফাইল"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "কেডিই (KDE)"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "গ�নোম"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "প�যাকেজ গ�র�প নির�বাচন"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "উপস�থিত জায়গার চাইতে নির�বাচিত সাইজটি অনেক বড়"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "ইনস�টলের ধরণ"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1166,87 +1321,111 @@ msgstr ""
 "আপনি প�যাকেজের কোন গ�র�প নির�বাচন করেননি।\n"
 "অন�গ�রহ করে আপনি যে ক�ষ�দ�রাকৃতির ইনস�টলেশন চান তা পছন�দ কর�ন:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X-�র সাথে"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "%s প�যাকেজ সমূহ ইনস�টল করা হচ�ছে"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "সাধারন নির�দেশিকার সাথে (পরামর�শ দেয়া হচ�ছে!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "�ক�কেবারেই ক�ষ�দ�র ইনস�টলেশন (বিশেষ করে কোন urpmi ছাড়া)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Bootloader প�রস�ত�ত করা হচ�ছে..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "ইনস�টলেশনের প�রস�ত�তি চলছে"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s প�যাকেজ সমূহ ইনস�টল করা হচ�ছে"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "প�যাকেজগ�লো বিন�যস�ত করতে গিয়ে �কটি ভ�ল ছিল:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "তব�ও যাব?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "প�নরায় চেষ�টা করো"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "�ই প�যাকেজটি �ড়িয়ে যাও"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\" মাধ�যমের সব প�যাকেজ �ড়িয়ে যাও"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "মিডিয়া �বং প�যাকেজের নির�বাচন � ফিরে যাও"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "%s প�যাকেজ ইনস�টল করতে সমস�যা হয়েছে।"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "ইনস�টলের পরের কনফিগারেশন"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "অন�গ�রহ করে নিশ�চিত কর�ন যে সাম�প�রতিক মডিউলগ�লো %s ড�রাইভ � আছে"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "আপডেট"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1267,28 +1446,29 @@ msgstr ""
 "\n"
 "আপনি কি ইনস�টল আপডেট করতে চান?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s -� %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "হার�ডওয়�যার"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "সাউন�ডকার�ড"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "আপনার কি �কটি ISA সাউন�ড কার�ড আছে?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1297,80 +1477,68 @@ msgstr ""
 "ইনস�টল শেষ হবার পরে সাউন�ড কার�ড কনফিগার করার জন�য \"alsaconf\" অথবা \"sndconfig"
 "\" চালাও"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "কোন সাউন�ডকার�ড সনাক�ত হয়নি, ইনস�টলের পরে \"harddrake\" দিয়ে চেষ�টা কর�ন"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "গ�রাফিকাল ইন�টারফেস"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "নেটওয়ার�ট �বং ইন�টারনেট"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "প�রক�সিসমূহ"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "কনফিগার করা হয়েছে"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "সিকউরিটি লেভেল"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "ফায়ারওয়াল"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "সক�রিয় হয়েছে"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "অকার�যকর করা হয়েছে"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "আপনি X কনফিগার করেননি। আপনি কি নিশ�চিত �রকমটি চান?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Bootloader প�রস�ত�ত করা হচ�ছে..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "ইনস�টলেশনের প�রস�ত�তি চলছে"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"আপনার মেশিনটি মনে হচ�ছে �কটি Oldworld বা অজানা মেশিন, yaboot ব�টলোডারটি আপনার "
-"জন�য কাজ করবে না। ইনস�টল �গিয়ে যাবে, কিন�ত� আপনার মেশিনকে ব�ট করার জন�য আপনাকে "
-"BootX বা অন�য কোন কিছ� ব�যবহার করতে হবে। root fs �র জন�য কার�নেল প�রেরিত মান হবে: "
-"root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1378,17 +1546,17 @@ msgid ""
 msgstr ""
 "�ই নিরাপত�তা লেভেলে, উইন�ডোজ পার�টিশনের ফাইলে প�রবেশ শ�ধ�মাত�র অ�যাডমিনিস�ট�রেটরের আছে।"
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s ড�রাইভে �কটি ফা�কা ফ�লপি ঢোকান"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "সয়ং ইনস�টল ফ�লপি তৈরী করা হচ�ছে..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1399,12 +1567,12 @@ msgstr ""
 "\n"
 "আপনি কি �খন বের হতে চান?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "স�বাগতম"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "রিব�ট"
@@ -1499,13 +1667,6 @@ msgid ""
 "Users"
 msgstr "ব�যবহারকারী"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "নেটওয়ার�ক করা"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1548,6 +1709,65 @@ msgid ""
 "Exit"
 msgstr "বাহির"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Bootloader প�রস�ত�ত করা হচ�ছে..."
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "ব�যবহারকারীর বন�ধ�সূলভ কিছ� �প�লিকেশন �বং ডোক�সটপ ট�লের সমন�বয়ে �কটি গ�রাফিকাল "
+#~ "পরিবেশ"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "IceWm ডেস�কটপ"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "১ মেগাবাইটের bootstrap �র জন�য খালি জায়গা নেই! ইনস�টল অগ�রসর হবে, কিন�ত� আপনার "
+#~ "সিস�টেম ব�ট করার জন�য, আপনাকে DiskDrake থেকে bootstrap পার�টিশন তৈরী করতে হবে"
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "আপনাকে �কটি PPC PReP Boot ব�টস�ট�র�যাপ তৈরী করতে হবে! ইনস�টলেশন অগ�রসর হবে, তবে "
+#~ "আপনার সিস�টেম ব�ট করার জন�য, DiskDrake �র ব�টস�ট�র�যাপ পার�টিশনটি প�রয়োজন"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "আপনার মেশিনটি মনে হচ�ছে �কটি Oldworld বা অজানা মেশিন, yaboot ব�টলোডারটি "
+#~ "আপনার জন�য কাজ করবে না। ইনস�টল �গিয়ে যাবে, কিন�ত� আপনার মেশিনকে ব�ট করার জন�য "
+#~ "আপনাকে BootX বা অন�য কোন কিছ� ব�যবহার করতে হবে। root fs �র জন�য কার�নেল প�রেরিত "
+#~ "মান হবে: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "স�বাগতম"
+
+#~ msgid "Select All"
+#~ msgstr "সব কিছ� নির�বাচিত"
+
+#~ msgid "Bad package"
+#~ msgstr "বাজে প�যাকেজ"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Bootloader প�রস�ত�ত করা হচ�ছে..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "নেটওয়ার�ক করা"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1596,7 +1816,7 @@ msgstr "বাহির"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/br.po b/perl-install/install/share/po/br.po
index 93860ae37..1c0b448d8 100644
--- a/perl-install/install/share/po/br.po
+++ b/perl-install/install/share/po/br.po
@@ -1,54 +1,79 @@
 # DrakX e Brezhoneg.
 # Copyright (C) 1999-2005 Mandriva
-# Thierry Vignaud <tvignaud@mandriva.com>, 1999-2005
+# Thierry Vignaud <thierry.vignaud.com>, 1999-2005
 # Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>, 1999-2000
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 10.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-03-30 15:55+0200\n"
-"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2014-11-19 20:55+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"
 "Plural-Forms: nplurals=1;plural=0\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
+msgid "Join Us!"
+msgstr "Deuit ganomp !"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr ""
+msgid "Your choice!"
+msgstr "Ho choaz !"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr ""
+msgid "Office tools"
+msgstr "Ostilhoù burevek"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr ""
+msgid "Home entertainment"
+msgstr "Evit ho plijadur"
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Evit ar vugale"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Evit ar familh !"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "For developers!"
+msgstr "Evit an dud"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Trugarez !"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Bezit dieub !"
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Hag ur vedia all hoc'h eus ?"
+msgstr "Hag ur media all hoc'h eus ?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -57,118 +82,180 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Rouedad (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Rouedad (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Rouedad (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL ar melezour ?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Dao en deus an URL kregiñ gant ftp:// pe http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"O taremprediñ al lec'hienn Mageia Linux evit kaout roll ar melezouroù "
-"hegerz ..."
+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:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Sac'het en ur taremprediñ al lec'hienn Mageia Linux evit kaout roll ar "
-"melezouroù hegerz "
+"Sac'het en ur zaremprediñ lec'hienn %s evit kaout roll ar melezourioù hegerz "
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Dibabit ur melezour da dapout ar pakadoù diwarnañ"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Kefluniadur NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Roit anv ostiz ha renkell ho media NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Mank ar ra anv an ostiz"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
-msgstr ""
+msgstr "Dao en eus anv ur renkell kregiñ gant ur « / »"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Anv ostiz ar marc'hañ NFS ?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Renkell"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "A-gresk"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
-"Ne m'eus ket kavout ur roll pakadoù e-barzh ar melezour-mañ.  Kit da wiriañ "
+"N’em eus ket kavout ur roll pakadoù e-barzh ar melezour-mañ.  Kit da wiriañ "
 "al lec'hiadur-mañ zo mad."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Gwelloc'h e vefe deoc'h bevaat « %s »"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, fuzzy, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Tremen e-biou pep pakad eus ar vediom « %s »"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
-msgstr "O kavout pakadoù zo staliet eo ..."
+msgstr "O klask ar pakadoù staliet ..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
-msgstr "O kavout pakadoù da vremanaat ..."
+msgstr "O klask ar pakadoù da vremanaat ..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
-msgstr "O zilemel ar pakadoù a-raok bremanaat ..."
+msgstr "O tilemel ar pakadoù a-raok bremanaat ..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -176,93 +263,93 @@ msgid ""
 "\n"
 "Do you really want to remove these packages?\n"
 msgstr ""
-"Ar pakadoù a-heul zo war-nes bezañ distaliet evit bremañaat ho reizhiad : "
+"Ar pakadoù a-heul zo war-nes bezañ distaliet evit bremanaat ho reizhiad : "
 "%s\n"
 "\n"
 "\n"
 "Ha fellout a ra deoc'h da vat lemel anezho ?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fazi en ur lenn ar restr %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Adenvelet e oa ar bladenn/pladennoù-mañ :"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (a vez graet %s dioutañ diaraok)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rouedad"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
-msgstr "Dibabit ur vedia, mar plij"
+msgstr "Dibabit ur media, mar plij"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Ar restr zo endeo. Rasklañ anezhañ ?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Aotre nac'het"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "N'eo ket un anv NFS mat"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
-msgstr "N'eo ket mat ar vedia %s"
+msgstr "N'eo ket mat ar media %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "N'hellan ket sevel skrammpakeroù a-raok parzhañ"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skrammpakeroù a vo bet kavet goude staliañ e %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "O staliañ"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Kefluniadur"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Ret eo deoc'h furmadiñ %s ivez"
@@ -284,22 +371,22 @@ msgstr "O lañsañ ar rouedad"
 msgid "Bringing down the network"
 msgstr "O tizenaouiñ ar rouedad"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Gortozit mar plij, o tigas ar restr"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr ""
+msgstr "n'hell ket bet ouzhpennet ar mediom"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Oc'h eilañ ur bern pakad hag a vo bet implijet diwezhatoc'h"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Oc'h eilañ"
@@ -329,347 +416,429 @@ msgstr "brav"
 msgid "maybe"
 msgstr "marteze"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "O tegas titouroù ar pakadoù eus an titouroù XML ..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Deskrivadur ebet"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
-"Ne m'eus ket gallet staliañ un darn pakad goulennet gant %s :\n"
+"N’em eus ket gallet staliañ un darn pakad goulennet gant %s :\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Ur fazi zo bet :"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Degouezhet ez eus ur fazi sac'hus : %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Na c'houlenn ket adarre"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d gra zo bet sac'het"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
-msgstr "Sac'het et bet staliañ ar pakadoù :"
+msgstr "Sac'het eo bet staliañ ar pakadoù :"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Post labour"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Post labour burevek"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programmoù burev : skridtreterezhioù (OpenOffice.org Writer, Kword), "
-"logerioù (OpenOffice.org Calc, Kspread), gwelerien PDF, ..."
+"Programmoù burev : skridtreterezhioù (LibreOffice Writer, Kword), logerioù "
+"(LibreOffice Calc, Kspread), gwelerien PDF, ..."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Arsav c'hoarioù"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Arsav liesvedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, 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:36
 #, c-format
 msgid "Internet station"
 msgstr "Arsav internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, 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:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Urzhiataer rouedad (kliant)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
-msgstr "Pratikoù evit meur a gomennad (da skouer ssh)"
+msgstr "Pratikoù evit meur a gomenad (da skouer ssh)"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, 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:53
 #, c-format
 msgid "Console Tools"
 msgstr "Ostilhoù letrin"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Diorren"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Teuliadur"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Servijer Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Strollant"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Dreuzell an Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Posteloù/keleier"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, 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:97
 #, c-format
 msgid "Directory Server"
 msgstr "Levr-bloaz"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Servijer FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, 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:112
 #, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Servijer rennañ restroù ha moullerez"
+msgstr "Servijer rannañ restroù ha moullerez"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Stlennvon"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Servijer stlennvon PostgreSQL ha MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Servijer stlennvon PostgreSQL ha MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Post"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Servijer postel Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servijer stlennvon PostgreSQL pe MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Servijer stlennvon PostgreSQL pe MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Servijer rouedad"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Endeo grafikel"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Post burevek KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
-msgstr "An Endro Burev K gant he ostilhoù"
+msgstr "An Endro Burev K gant hec’h ostilhoù"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Post burevek GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, 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:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Post burevek XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Post burevek MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Post labour Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Endeo grafikel"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Burev LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Burev Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Burev LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Endeo grafikel"
+
+#: share/meta-task/compssUsers.pl:194
 #, c-format
+msgid "Plasma Desktop"
+msgstr "Burev Plasma"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "An Endro Burev K gant hec’h ostilhoù"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Burevioù c'hrafek all"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, c-format
 msgid "Utilities"
 msgstr "Mavegoù"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Servijer SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, 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:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Ostilhoù ar rouedad/diwall"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
-msgstr "Skozelerien Mageia"
+msgstr "Skoazellerien Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
-msgstr "Skozelerien evit kefluniañ ar servijer"
+msgstr "Skoazellerien evit kefluniañ ar servijer"
 
 #: steps.pm:85
 #, c-format
@@ -680,7 +849,7 @@ msgstr ""
 "Degouezhet ez eus ur fazi, hogen n'ouzon ket e verañ naet.\n"
 "Kendalc'hit war ho mar."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -696,329 +865,329 @@ msgstr "O kregiñ gant al lankad `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Staliadur Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Staliadur %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> etre elfennoù"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Staliañ burev KDE Mageia"
+msgid "Media Selection"
+msgstr "Diuzadenn ar media"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Staliañ burev GNOME Mageia"
+msgid "Install %s KDE Desktop"
+msgstr "Staliañ burev KDE %s"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Staliañ burev GNOME %s"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
-msgstr "Staliadur diouzoc'h"
+msgstr "Staliadur diouzhoc'h"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Burev KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Burev GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
-msgstr "Burev diouzoc'h"
+msgstr "Burev diouzhoc'h"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
-msgstr "Setu ur rakwell eus burev « %s »."
+msgstr "Setu ur rakwel eus burev « %s »."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Diuzadenn strollad pakadoù"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Diuz pakadoù unan hag unan"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Ment hollek : %d / %d Mo"
+msgid "Unselect All"
+msgstr "Andiuz an holl re"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Pakad siek"
+msgid "Total size: %d / %d MB"
+msgstr "Ment hollek : %d / %d Mo"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Stumm : "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Ment : "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d Ko\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Talvoudegezh : "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "N'hellit ket diuz/andiuz ar pakad-mañ"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
-msgstr "peogwir %s zo manket"
+msgstr "peogwir e vank %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
-msgstr "peogwir %s zo manket"
+msgstr "peogwir e vank %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "evit mirout %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "N'hellit ket dibab ar pakad-mañ peogwir n'eus ket a-walc'h a egor evit "
 "staliañ anezhañ"
 
-#: steps_gtk.pm:456
+#: 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:457
+#: 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:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Hemañ zo ur pakad ret, n'hell ket bezañ andiuzet"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
-msgstr "N'hellit ket andiuz ar pakad-mañ. Staliet eo endo"
+msgid "You cannot unselect this package. It is already installed"
+msgstr "N'hellit ket andiuz ar pakad-mañ. Staliet eo endeo"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+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:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
-msgstr "Diskouez ar pakadoù a zo dibabet emgefrek"
+msgstr "Diskouez ar pakadoù a zo dibabet emgefreek"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Staliañ"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Kargañ/Enrollañ an dibab"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
-msgstr "O bremañaat diuzadenn ar pakadoù"
+msgstr "O bremanaat diuzadenn ar pakadoù"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Staliadur bihan"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Merañ ar pakadoù"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Dibabit ar pakadoù a vennit staliañ"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "O staliañ"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
-msgstr "Munudoù ebet"
+msgstr "Munud ebet"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Amzer a chom :"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(o vrasjediñ ...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakad"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
-msgstr "Evit diverriñ"
+msgstr "Diverradenn"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Kefluniañ"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "n'eo ket kefluniet"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Diuzadenn ar media"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
-msgstr "Eilañ tout an CDoù"
+msgstr "Eilañ tout ar CDoù"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Ur fazi zo bet"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Dibabit reizhadur ho stokellaoueg mar plij"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Setu eo listenn leun ar stokellaoueg :"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
-msgstr "Staliañ/Bremanaat"
+msgstr "Staliañ/Bremañaat"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "Hag ur staliadur pe ur bremanadur eo ?"
+msgstr "Hag ur staliadur pe ur bremañadur eo ?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Staliadur"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Bremanaat %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Alc'hwez enrinegadur evit %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
-msgstr ""
+msgstr "Nulañ ar staliadur ; adloc’hañ an urzhiataer"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Staliadur nevez"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1027,32 +1196,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Kefluniañ IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1064,75 +1218,75 @@ msgstr ""
 "\n"
 "Lakait el lenner ar Cd-Rom warnañ an diketenn « %s » mar plij ha gwaskit Mat "
 "eo da c'houde.\n"
-"Ma n'emañ ket ganeoc'h gwaskit Nullañ evit chom hep staliañ ar Cd-Rom-se."
+"Ma n'emañ ket ganeoc'h gwaskit Nullañ evit chom hep staliañ ar CD-Rom-se."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "O klask ar pakadoù hegerz ..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"Dibabit kargañ pe enrollañ choazh ar pakadoù mar plij.\n"
+"Dibabit kargañ pe enrollañ choaz ar pakadoù mar plij.\n"
 "Ar furmad zo hini ar restroù auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Kargañ"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Enrollañ"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "N'eo ket mat ar restr"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Dibab ar burev"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Brasoc'h eo ment dibabet evit egor dieub"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Seurt ar staliadur"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1141,87 +1295,111 @@ msgstr ""
 "N'eus ket strollad pakadoù dibabet ebet.\n"
 "Dibabit ar staliañ vihanañ e fell deoc'h implij mar plij :"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Gant X"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "O staliañ ar pakad %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr "Staliañ ar pakadoù aliet"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Gant un teuliadur bihan (kuzuliet !)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Staliadur bihan gwir (n'eus urpmi ebet)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "O prientiñ ar bremanaat ..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "O prientiñ ar staliadur"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "O staliañ ar pakad %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Ur fazi zo bet en ur rummañ pakadoù :"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Kenderc'hel evelato ?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Adklask"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Tremen e-biou ar pakad-mañ"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
-msgstr "Tremen e-biou pep pakad eud ar vedium « %s »"
+msgstr "Tremen e-biou pep pakad eus ar vediom « %s »"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Distro da ziuzadenn ar pakadoù hag ar media"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Ur fazi zo bet en ur staliañ ar pakad %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Kefluniadur goude staliañ"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
-msgstr "Bremañaat"
+msgstr "Bremanaat"
+
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1233,36 +1411,37 @@ msgid ""
 "\n"
 "Do you want to install the updates?"
 msgstr ""
-"Moien zo dit da bellkargañ ar pakadoù bremañaet. Bremañaet e oa ar\n"
+"Moaien zo dit da bellgargañ ar pakadoù bremanaet. Bremanaet e oa ar\n"
 "pakadoù-mañ goude e oa echu an ingaladur. Gallout a ra kaout difazioù\n"
 "surentez pe difazioù bogoù.\n"
 "\n"
-"Red eo da gaout ur gevreadenn bev ouzh internet evit staliañ anezho.\n"
+"Ret eo da gaout ur gevreadenn bev ouzh internet evit staliañ anezho.\n"
 "\n"
 "Mennout a rit staliañ anezho ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s war %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Periantel"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Kartenn gwelet"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Hag ur gartenn gwelet ISA hoc'h eus ?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1271,94 +1450,86 @@ msgstr ""
 "Seveniñ « alsaconf » pe « sndconfig » goude staliañ evit kefluniañ ho "
 "kartenn klevet"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, 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:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Ketal kevregañ"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Rouedad hag Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proksioù"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "kefluniet"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Live an surentez"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Moger tan"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "bevaatet"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "diweredekaet"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, 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:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "O prientiñ ar c'harger loc'hañ ..."
+msgid "Preparing initial startup program..."
+msgstr "O prientiñ ar programm loc'hañ ..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
-msgstr ""
+msgstr "Gortozit mar plij ; gellout a rafe bezañ hir ..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Lakait ur bladennig gwerc'h el lenner %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "O krouiñ ur bladennig staliañ emgefreek ..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1369,12 +1540,12 @@ msgstr ""
 "\n"
 "Mennout a rit kuitaat da vat bremañ ?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Brav"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Adlañsañ"
@@ -1390,7 +1561,7 @@ msgstr "Yezh"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "Troidigezh"
 
 #: steps_list.pm:17
 #, c-format
@@ -1439,7 +1610,7 @@ msgstr "Diogelroez"
 msgid ""
 "_: Keep these entry short\n"
 "Partitioning"
-msgstr "O parzhañ"
+msgstr "Parzhañ"
 
 #: steps_list.pm:27 steps_list.pm:28
 #, c-format
@@ -1453,14 +1624,14 @@ msgstr "O furmadiñ"
 msgid ""
 "_: Keep these entry short\n"
 "Choosing packages"
-msgstr "Choazh ar pakadoù"
+msgstr "Choaz ar pakadoù"
 
 #: steps_list.pm:31
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Installing"
-msgstr "O staliañ"
+msgstr "Staliañ"
 
 #: steps_list.pm:34
 #, c-format
@@ -1469,13 +1640,6 @@ msgid ""
 "Users"
 msgstr "Arveriaded"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Rouedad"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1495,7 +1659,7 @@ msgstr "Kefluniañ X"
 msgid ""
 "_: Keep these entry short\n"
 "Summary"
-msgstr "Evit diverriñ"
+msgstr "Diverradenn"
 
 #: steps_list.pm:44 steps_list.pm:45
 #, c-format
@@ -1509,7 +1673,7 @@ msgstr "Servijoù"
 msgid ""
 "_: Keep these entry short\n"
 "Updates"
-msgstr "Bremañaat"
+msgstr "Bremanaat"
 
 #: steps_list.pm:48
 #, c-format
@@ -1518,6 +1682,41 @@ msgid ""
 "Exit"
 msgstr "Kuitaat"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "O prientiñ ar c'harger loc'hañ ..."
+
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Burev RazorQT"
+
+#~ msgid "Welcome"
+#~ msgstr "Degemer"
+
+#~ msgid "People!"
+#~ msgstr "Tud !"
+
+#~ msgid "For you"
+#~ msgstr "Evidoc'h"
+
+#~ msgid "Welcome!"
+#~ msgstr "Degemer !"
+
+#~ msgid "Select All"
+#~ msgstr "Diuz an holl re"
+
+#~ msgid "Bad package"
+#~ msgstr "Pakad siek"
+
+#~ msgid "Preparing boot images..."
+#~ msgstr "O prientiñ ar c'harger loc'hañ ..."
+
+#~ msgid "Mageia, the new Linux distribution"
+#~ msgstr "Mageia, un distro Linux nevez"
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Rouedad"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1535,7 +1734,7 @@ msgstr "Kuitaat"
 #~ msgstr "O taremprediñ ar melezour evit kaout roll ar pakadoù hegerz ..."
 
 #~ msgid "Unable to contact mirror %s"
-#~ msgstr "Ne m'eus ket daremprediñ ar melezour %s"
+#~ msgstr "N’em eus ket daremprediñ ar melezour %s"
 
 #~ msgid "Generate auto install floppy"
 #~ msgstr "Krouiñ ur bladennig staliañ emgefreek"
@@ -1547,7 +1746,7 @@ msgstr "Kuitaat"
 #~ msgstr "Emgefreek"
 
 #~ msgid "Save packages selection"
-#~ msgstr "Enrollañ diuzadenn an pakadoù"
+#~ msgstr "Enrollañ diuzadenn ar pakadoù"
 
 #~ msgid "Do you want to use aboot?"
 #~ msgstr "Mennout a rit implijout aboot ?"
@@ -1644,7 +1843,7 @@ msgstr "Kuitaat"
 #~ msgstr "O furmadiñ"
 
 #~ msgid "Choosing packages"
-#~ msgstr "Choazh ar pakadoù"
+#~ msgstr "Choaz ar pakadoù"
 
 #~ msgid "Users"
 #~ msgstr "Arveriaded"
diff --git a/perl-install/install/share/po/bs.po b/perl-install/install/share/po/bs.po
index 3f5a42eee..34b07e2fb 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: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+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"
@@ -22,38 +22,63 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Uredska radna stanica"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Thank you!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Be Free!"
 msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 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:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -66,93 +91,87 @@ msgstr ""
 "\n"
 "Imate li još neke dodatne medije koje želite podesiti?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "sa CDROMa"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Mreža (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Mreža (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Mreža (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL mirrora?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL mora po�injati sa ftp:// ili http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Kontaktiram Mageia Linux web stranicu da bih saznao listu dostupnih "
-"mirrora..."
+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:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr ""
-"Nisam uspio kontaktirati Mageia Linux web stranicu radi liste dostupnih "
-"mirrora"
+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:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Izaberite mirror sa kojeg će biti dobavljeni paketi"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Podešavanje NFS-a"
 
-#: any.pm:228
+#: any.pm:294
 #, 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:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Ime ra�unara sa NFS serverom?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Direktorij"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -161,23 +180,90 @@ msgstr ""
 "Ne mogu pronaći hdlist datoteku na ovom mirroru. Provjerite da li je "
 "lokacija ispravna."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Tražim već instalirane pakete..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Pronalazim pakete za unaprjeđenje..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -191,87 +277,87 @@ msgstr ""
 "\n"
 "Želite li zaista deinstalirati ove pakete?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Greška u �itanju datoteke %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Sljedeći diskovi su preimenovani:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (ranije pod imenom %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Mreža"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Molim izaberite medij"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Datoteka već postoji. Želite li pisati preko nje?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Nemate dozvolu"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Neispravan NFS naziv"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Neispravan medij %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Ne mogu napraviti snimak ekrana prije particioniranja"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Snimanje ekrana će biti dostupno nakon što instalirate u %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalacija"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Podešavanje"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Morate takođe formatirati i %s"
@@ -296,22 +382,22 @@ msgstr "Pokrećem mrežu"
 msgid "Bringing down the network"
 msgstr "Zaustavljam mrežu"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiram neke pakete na disk radi buduće upotrebe"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiranje u toku"
@@ -341,73 +427,98 @@ msgstr "fino"
 msgid "maybe"
 msgstr "možda"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Bez opisa"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Došlo je do greške"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Došlo je do fatalne greške: %s"
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Instalacija nije uspjela"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instaliram paket %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Radna stanica"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Uredska radna stanica"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Uredski programi: obrada teksta (OpenOffice.org Write, KWord), tabli�ni "
-"prora�un (OpenOffice.org Calc, KSpread), PDF preglednici itd."
+"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:26
 #, c-format
 msgid "Game station"
 msgstr "Stanica za igru"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, 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:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedijalna stanica"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, 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:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet stanica"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -416,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:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Mrežni ra�unar (klijent)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, 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:49
 #, 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:53
 #, c-format
 msgid "Console Tools"
 msgstr "Alati za konzolu"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Programiranje"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, 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:79
 #, c-format
 msgid "Web Server"
 msgstr "Web server"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet gateway"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Mail/News"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, 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:97
 #, c-format
 msgid "Directory Server"
 msgstr "Imeni�ki server"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP server"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, 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:112
 #, 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:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Baze podataka"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Server PostgreSQL ili MySQL baze podataka"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Server PostgreSQL ili MariaDB baze podataka"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Mail"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix mail server"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ili MySQL baza podataka"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL ili MariaDB baza podataka"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Mrežni server"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafi�ko okruženje"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE radna stanica"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -610,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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME radna stanica"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -624,66 +735,128 @@ 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:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE radna stanica"
+
+#: share/meta-task/compssUsers.pl:165
+#, 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:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME radna stanica"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Radna stanica"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Grafi�ko okruženje"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "IceWm okruženje"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, 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:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "IceWm okruženje"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 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:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "IceWm okruženje"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"K Desktop Environment, osnovno grafi�ko okruženje sa izborom pratećih alata"
+
+#: share/meta-task/compssUsers.pl:199
 #, 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:200
+#, 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:223
 #, c-format
 msgid "Utilities"
 msgstr "Alati"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH server"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, 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:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Mrežni alati i nadzor"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, 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:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia �arobnjaci"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Čarobnjaci (wizardi) za podešavanje serverâ"
@@ -697,7 +870,7 @@ msgstr ""
 "Došlo je do greške, ali ne znam kako da postupim u vezi toga.\n"
 "Nastavite na vlastiti rizik."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -707,7 +880,7 @@ msgid ""
 msgstr ""
 "Neki bitni paketi nisu ispravno instalirani.\n"
 "Ili je neispravan vaš CD-ROM uređaj ili vaš CD-ROM medij.\n"
-"Možete provjerite medij na ra�unaru sa instaliranim Mageia Linuxom\n"
+"Možete provjerite medij na ra�unaru sa instaliranim Mageiaom\n"
 "koristeći naredbu \"rpm -qpl media/main/*.rpm\"\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
@@ -717,224 +890,228 @@ msgstr "Prelazim na korak '%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux instalacija %s"
+msgid "%s Installation %s"
+msgstr "%s instalacija %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> između elemenata"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vašem sistemu ponestaje resursa. Možda imate neki problem sa instalacijom\n"
-"Mageia Linuxa. Ako se ovo desi, možete pokušati tekstualnu instalaciju. Za "
-"ovo,\n"
+"%sa. Ako se ovo desi, možete pokušati tekstualnu instalaciju. Za ovo,\n"
 "pritisnite 'F1' prilikom pokretanja instalacije, zatim unesite rije� 'text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Izbor grupe paketa"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Minimalna instalacija"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "IceWm okruženje"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "IceWm okruženje"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "IceWm okruženje"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Izbor grupe paketa"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Izbor pojedina�nih paketa"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Ukupna veli�ina: %d / %d MB"
+msgid "Unselect All"
+msgstr "Ništa izabrano"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Neispravan paket"
+msgid "Total size: %d / %d MB"
+msgstr "Ukupna veli�ina: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Verzija: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Veli�ina: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Zna�aj: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Ne možete izabrati/isklju�iti ovaj paket"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "zbog nedostajućeg %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zbog nezadovoljenog %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokušavam promovirati %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "kako biste zadržali %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Ne možete izabrati ovaj paket jer nema dovoljno prostora za njega"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Sljedeći paketi će biti instalirani"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Sljedeći paketi će biti uklonjeni"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ovo je obavezan paket, ne može biti isklju�en"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Ne možete isklju�iti ovaj paket. On je već instaliran"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Ne možete isklju�iti ovaj paket. On mora biti unaprijeđen"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Automatski prikaži izabrane pakete"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalacija"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "U�itajte ili snimite izbor paketa"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Ažuriram spisak paketa"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimalna instalacija"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Programi"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Izaberite pakete koje želite instalirati"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instaliram"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Sakrij detalje"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Preostalo vremena "
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Procjenjujem"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
@@ -942,27 +1119,22 @@ msgstr[0] "%d paketa"
 msgstr[1] "%d paketa"
 msgstr[2] "%d paketa"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Ukratko"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Podesi"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "nije podešeno"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Izbor grupe paketa"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -971,84 +1143,84 @@ msgstr ""
 "Pronađeni su sljedeći instalacioni mediji.\n"
 "Ako želite presko�iti neke od njih, možete ih isklju�iti sada."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Imate mogućnost da kopirate sadržaj CDova na hard disk prije instalacije.\n"
 "Zatim će instalacija biti nastavljena sa hard diska, a paketi će ostati "
 "dostupni nakon Å¡to sistem bude instaliran."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiraj �itave CDove"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Došlo je do greške"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Molim izaberite raspored vaše tastature"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Ovdje je puna lista svih dostupnih tastatura"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instaliraj/Unaprijedi"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Da li je ovo instalacija ili unaprjeđenje?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalacija"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Unaprijedi %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Klju� enkripcije za %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Instalacija"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1057,37 +1229,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Podešavam IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Nema dovoljno slobodnog prostora za 1 MB bootstrap! Instalacija će "
-"nastaviti, ali da biste pokrenuli vaš sistem morate kreirati bootstrap "
-"particiju u DiskDrake-u"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Trebate napraviti PPC PReP Boot bootstrap! Instalacija će nastaviti, ali da "
-"biste pokrenuli vaš sistem morate kreirati bootstrap particiju u DiskDrake-u"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1101,19 +1253,19 @@ msgstr ""
 "Ako ga nemate, pritisnite \"Odustani\" da presko�ite instalaciju sa tog CD-"
 "ROMa."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Tražim dostupne pakete..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1122,52 +1274,52 @@ msgstr ""
 "Molim izaberite da li ćete u�itati ili snimiti izbor paketa.\n"
 "Format je isti kao i diskete koje generiše auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "U�itaj"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Snimi"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Neispravna datoteka"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Izbor grupe paketa"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Izabrana veli�ina je veća od slobodnog prostora"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Vrsta instalacije"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1176,87 +1328,111 @@ msgstr ""
 "Niste izabrali nijednu grupu paketa\n"
 "Molim izaberite vrstu minimalne instalacije koju želite:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Sa grafikom"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Instaliram paket %s"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Sa osnovnom dokumentacijom (preporu�eno)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Stvarno minimalna instalacija (posebno bez urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Pripremam bootloader..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Pripremam instalaciju"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instaliram paket %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Došlo je do greške pri raspoređivanju paketa:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Da nastavim?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Pokušaj ponovo"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Spasi izbor paketa"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Došlo je do greške kod instaliranja paketa:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Post-instalacijsko podešavanje"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Molim provjerite da je medij za ažuriranje u uređaju %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Ažuriranje"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1277,28 +1453,29 @@ msgstr ""
 "\n"
 "Da li želite instalirati ažurirane pakete ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Zvu�na kartica"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Imate li ISA zvu�nu karticu?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1307,81 +1484,69 @@ msgstr ""
 "Pokrenite \"alsaconf\" ili \"sndconfig\" poslije instalacije kako biste "
 "podesili vašu zvu�nu karticu"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Nije otkrivena zvu�na kartica. Probajte \"harddrake\" poslije instalacije"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafi�ki interfejs"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Mreža i Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxy-ji"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "podešeno"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Sigurnosni nivo"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktiviran"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "isklju�en"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Niste podesili X. Sigurno želite uraditi ovo?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Pripremam bootloader..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Pripremam instalaciju"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Izgleda da imate OldWorld ili Unknown ra�unar, yaboot bootloader neće raditi "
-"kod vas. Instalacija će se nastaviti, ali ćete morati koristiti BootX ili "
-"neki drugi na�in za bootanje vašeg ra�unara. Argument kernela za root fs je: "
-"root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1390,17 +1555,17 @@ msgstr ""
 "Na ovom sigurnosnom nivou, pristup datotekama na Windows particijama je "
 "dozvoljen samo administratoru."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Ubacite praznu disketu u jedinicu %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Pravim auto instalacijsku disketu..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1411,12 +1576,12 @@ msgstr ""
 "\n"
 "Da li zaista želite izaći sada?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "ÄŒestitamo"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Restartuj"
@@ -1511,13 +1676,6 @@ msgid ""
 "Users"
 msgstr "Korisnici"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Mreža"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1560,6 +1718,67 @@ msgid ""
 "Exit"
 msgstr "Izlaz"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Pripremam bootloader..."
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast 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"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "IceWm okruženje"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "Nema dovoljno slobodnog prostora za 1 MB bootstrap! Instalacija će "
+#~ "nastaviti, ali da biste pokrenuli vaš sistem morate kreirati bootstrap "
+#~ "particiju u DiskDrake-u"
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "Trebate napraviti PPC PReP Boot bootstrap! Instalacija će nastaviti, ali "
+#~ "da biste pokrenuli vaš sistem morate kreirati bootstrap particiju u "
+#~ "DiskDrake-u"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Izgleda da imate OldWorld ili Unknown ra�unar, yaboot bootloader neće "
+#~ "raditi kod vas. Instalacija će se nastaviti, ali ćete morati koristiti "
+#~ "BootX ili neki drugi na�in za bootanje vašeg ra�unara. Argument kernela "
+#~ "za root fs je: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Dobro došli"
+
+#~ msgid "Select All"
+#~ msgstr "Sve izabrano"
+
+#~ msgid "Bad package"
+#~ msgstr "Neispravan paket"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Pripremam bootloader..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Mreža"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1609,7 +1828,7 @@ msgstr "Izlaz"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/ca.po b/perl-install/install/share/po/ca.po
index 34fa1714f..f31c1b0d7 100644
--- a/perl-install/install/share/po/ca.po
+++ b/perl-install/install/share/po/ca.po
@@ -1,57 +1,83 @@
-# translation of ca.po to Catalan
-# translation of DrakX.po to Catalan
-# Copyright (C) 2000-2004, 2005 Free Software Foundation, Inc.
-# Softcatala, softcatala.org, 2000-2003
-# Albert Astals Cid <astals11@terra.es>, 2003-2004, 2005.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Francesc Pinyol Margalef, 2012-2013
+# Davidmp <medipas@gmail.com>, 2015
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: ca\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2005-09-13 23:24+0200\n"
-"Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
-"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-11-21 08:56+0000\n"
+"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>\n"
+"Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
+"ca/)\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
+msgid "Join Us!"
+msgstr "Adheriu-vos!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr ""
+msgid "Make it yours!"
+msgstr "Feu-lo vostre!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr ""
+msgid "Your choice!"
+msgstr "La vostra tria!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr ""
+msgid "Office tools"
+msgstr "Eines d'oficina"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr ""
+msgid "Home entertainment"
+msgstr "Oci de la llar"
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Per als nens"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Per a la família!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Per als desenvolupadors!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Gràcies!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Sigueu lliures!"
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr ""
+msgstr "Teniu més suports addicionals?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -59,117 +85,198 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
+"S'han trobat els següents suports i es faran servir durant la instal·lació: "
+"%s\n"
+"\n"
+"\n"
+"Teniu algun suport d'instal·lació addicional per a configurar?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Xarxa (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Xarxa (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Xarxa (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL de la rèplica?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
-msgstr ""
+msgstr "L'URL ha de començar amb ftp:// o bé http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"S'està contactant amb el servidor Mageia Linux per obtenir la llista de "
-"rèpliques disponibles..."
+"S'està contactant amb el servidor %s per obtenir la llista de rèpliques "
+"disponibles..."
 
-#: any.pm:187
-#, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+#: any.pm:253
+#, c-format
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"S'està contactant amb el servidor Mageia Linux per obtenir la llista de "
-"rèpliques disponibles..."
+"Ha fallat la connexió amb el lloc web %s per obtenir la llista de rèpliques "
+"disponibles"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Escolliu una rèplica des de la qual aconseguir els paquets"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
-msgstr ""
+msgstr "Configuració NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
-msgstr ""
+msgstr "Introduïu el nom de l'ordinador i del directori del suport NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
-msgstr ""
+msgstr "Falta el nom d'amfitrió"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
-msgstr ""
+msgstr "El directori ha de començar amb «/»"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
-msgstr ""
+msgstr "Nom d'amfitrió del muntatge NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Directori"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
-msgstr ""
+msgstr "Addicional"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
-msgstr "No s'ha pogut trobat el fitxer hdlist en aquest rèplica"
+msgstr ""
+"No s'ha pogut trobar el llistat dels paquets en aquesta rèplica. Assegureu-"
+"vos que la localització és correcta."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Algun maquinari de l'ordinador requereix microprogramari no lliure perquè "
+"els controladors lliures funcionin."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Hauríeu d'habilitar «%s»"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+"«%s» conté els diversos components dels sistemes i les seves aplicacions"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "«%s» conté programari no lliure.\n"
+
+#: any.pm:477
+#, 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 ""
+"També conté microprogramari necessari per al funcionament d'alguns "
+"dispositius (per exemple: algunes targetes gràfiques ATI/AMD, algunes "
+"targetes de xarxa, algunes targetes RAID, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"«%s» conté programari que no es pot distribuir a tots els països per culpa "
+"de les patents de programari."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "També conté programari de «%s» recompilat amb capacitats addicionals."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Aquí podeu habilitar més suports, si ho voleu."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+"Aquest suport proporciona actualitzacions de paquets per al suport «%s»"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "S'estan cercant els paquets ja instal·lats..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
-msgstr "S'estan cercant els paquets a actualitzar"
+msgstr "S'estan cercant els paquets a actualitzar..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
-msgstr ""
+msgstr "S'estan eliminant els paquets abans de l'actualització..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -182,87 +289,87 @@ msgstr ""
 "\n"
 "Voleu realment suprimir aquests paquets?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "S'ha produït un error en llegir el fitxer %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
-msgstr ""
+msgstr "El(s) següent(s) disc(s) ha(n) estat reanomenat(s):"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
-msgstr ""
+msgstr "%s (abans anomenat %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Xarxa"
 
-#: any.pm:1102
-#, fuzzy, c-format
+#: any.pm:1386
+#, c-format
 msgid "Please choose a media"
-msgstr "Si us plau escolliu"
+msgstr "Escolliu un suport"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "El fitxer ja existeix. El voleu sobreescriure?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "S'ha denegat el permís"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nom NFS incorrecte"
 
-#: any.pm:1191
-#, fuzzy, c-format
+#: any.pm:1475
+#, c-format
 msgid "Bad media %s"
-msgstr "s'ha afegit la font %s"
+msgstr "Suport incorrecte %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "No es poden fer captures de pantalla abans de fer les particions"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Les captures estaran disponibles després d'instal·lar a %s"
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
-msgstr "S'està instal·lant"
+msgstr "Instal·lació"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configuració"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "També heu de formatar %s"
@@ -274,7 +381,7 @@ msgid ""
 "You can find some information about them at: %s"
 msgstr ""
 "Part del maquinari del vostre ordinador necessita controladors\n"
-"\"registrats\" per poder funcionar. Podeu trobar-ne informació a: %s"
+"«registrats» per poder funcionar. Podeu trobar-ne informació a: %s"
 
 #: interactive.pm:22
 #, c-format
@@ -286,22 +393,22 @@ msgstr "S'està activant la xarxa"
 msgid "Bringing down the network"
 msgstr "S'està desactivant la xarxa"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
-msgstr ""
+msgstr "S'està recuperant el fitxer"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr ""
+msgstr "no s'ha pogut afegir el suport"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
-msgstr ""
+msgstr "S'estan copiant alguns paquets al disc per a un ús futur"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Còpia en procés"
@@ -331,74 +438,102 @@ msgstr "bonic"
 msgid "maybe"
 msgstr "potser"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "S'està obtenint informació del paquet des de les metadades XML..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"No s'ha trobat informació xml per al suport «%s»; només resultat parcial per "
+"al paquet %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Cap descripció"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
+"Alguns paquets sol·licitats per %s no es poden instal·lar:\n"
+"%s"
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "S'ha produït un error"
+msgstr "S'ha produït un error:"
+
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "S'ha produït un error fatal: %s."
 
-#: pkgs.pm:814
-#, fuzzy, c-format
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "No tornar a preguntar"
+
+#: pkgs.pm:911
+#, c-format
 msgid "%d installation transactions failed"
-msgstr "Instal·lació fallida"
+msgstr "Han fallat %d transaccions d'instal·lació"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "S'està instal·lant el paquet %s"
+msgstr "La instal·lació de paquets ha fallat:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Estació de treball"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Estació de treball d'oficina"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programes d'ofimàtica: processadors de textos (OpenOffice.org Writer, "
-"Kword), fulls de càlcul (OpenOffice.org Calc, Kspread), visualitzadors pdf, "
-"etc."
+"Programes d'ofimàtica: processadors de textos (LibreOffice Writer, Kword), "
+"fulls de càlcul (LibreOffice Calc, Kspread), visualitzadors PDF, etc."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Estació de jocs"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programes d'entreteniment: acció, jocs de taula, estratègia, etc."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Estació multimèdia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programes de reproducció/edició de so i vídeo"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Estació d'Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -407,193 +542,193 @@ msgstr ""
 "Conjunt d'eines per llegir i enviar correu i notícies (mutt, tin...) i per "
 "navegar pel Web"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Ordinador de xarxa (client)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
-msgstr "Clients per a diferents protocols, incloent l'ssh"
+msgstr "Clients per a diferents protocols, incloent-hi l'ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Eines per facilitar la configuració de l'ordinador"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Eines de consola"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editors, intèrprets d'ordres, eines de fitxer, terminals"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Desenvolupament"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Biblioteques de desenvolupament C i C++, programes i fitxers include"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentació"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Llibres i Com es fa... sobre el Linux i el programari lliure"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Base Estàndard de Linux (LSB). Suport a aplicacions de tercers"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Servidor Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Servidor Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Tallafoc/Encaminador"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Passarel·la a Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Correu/Notícies"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Servidor de correu Postfix, Servidor de noticies Inn"
+msgstr "Servidor de correu Postfix, servidor de notícies Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Servidor de directori"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Servidor de Noms de Domini i d'Informació de la Xarxa (DNS/NIS)"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Servidor de compartició de fitxers i impressores"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Servidor NFS, Servidor Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Base de dades"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Servidor de bases de dades PostgreSQL i MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Servidor de bases de dades PostgreSQL i MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache i Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Correu"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Servidor de correu Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de bases de dades PostgreSQL o MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Servidor de bases de dades PostgreSQL o MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Servidor d'ordinador de xarxa"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Servidor NFS, Servidor SMB, Servidor Proxy, Servidor SSH"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Entorn gràfic"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Estació de treball KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -602,12 +737,12 @@ msgstr ""
 "L'entorn d'escriptori K (KDE), l'entorn gràfic bàsic que inclou diverses "
 "eines"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Estació de treball GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -616,67 +751,125 @@ msgstr ""
 "Entorn gràfic amb un conjunt d'aplicacions i eines d'escriptori fàcil "
 "d'utilitzar"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Estació de treball XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Entorn gràfic més lleuger amb un conjunt d'aplicacions i eines d'escriptori "
+"fàcil d'utilitzar"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Estació de treball MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Estació de treball Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Entorn gràfic basat en GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Escriptori LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Un port QT de propera generació de l'entorn d'escriptori lleuger"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Escriptori Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Un entorn gràfic lleuger i ràpid amb un seguiment dedicat"
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "Escriptori IceWm"
+msgstr "Escriptori LXDE"
+
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Un entorn gràfic ràpid i lleuger"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Escriptori Plasma"
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Entorn gràfic amb un conjunt d'aplicacions i eines d'escriptori fàcil "
-"d'utilitzar"
+"L'escriptori Plasma, l'entorn gràfic bàsic acompanyat d'una col·lecció "
+"d'eines"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Altres escriptoris gràfics"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, etc."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilitats"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Servidor SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr ""
+msgstr "Servidor remot de configuració de Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Utilitats de xarxa/Monitorització"
+msgstr "Utilitats/monitoratge de la xarxa"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
-msgstr ""
+msgstr "Eines de monitoratge, comptabilitat de processos, tcpdump, nmap..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Auxiliars de Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Auxiliars per configurar el servidor"
@@ -690,7 +883,7 @@ msgstr ""
 "S'ha produït un error, però no sé com gestionar-lo correctament.\n"
 "Si continueu, és sota la vostra responsabilitat."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -700,8 +893,8 @@ msgid ""
 msgstr ""
 "Alguns paquets importants no s'han instal·lat correctament.\n"
 "La vostra unitat de CD-ROM, o bé el CD-ROM, són defectuosos.\n"
-"Comproveu el CD-ROM en un ordinador instal·lat mitjançant \"rpm -qpl media/"
-"main/*.rpm\"\n"
+"Comproveu el CD-ROM en un ordinador instal·lat mitjançant «rpm -qpl media/"
+"main/*.rpm»\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
@@ -710,334 +903,340 @@ msgstr "S'està entrant en el pas '%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Instal·lació del Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Instal·lació del %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> entre elements"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
-msgstr ""
+msgstr "El servidor Xorg triga a arrencar. Espereu..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "El vostre sistema està baix de recursos; podeu tenir algun problema en\n"
-"instal·lar el Mageia Linux. Si això passa, podeu provar d'instal·lar-lo en\n"
+"instal·lar %s. Si això passa, podeu provar d'instal·lar-lo en\n"
 "mode text. Per fer-ho, premeu 'F1' en arrencar des del CD-ROM i escriviu "
 "'text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr ""
+msgid "Media Selection"
+msgstr "Selecció de suports"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr ""
+msgid "Install %s KDE Desktop"
+msgstr "Instal·la %s l'escriptori KDE"
+
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Instal·la %s l'escriptori GNOME"
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "Instal·lació mínima"
+msgstr "Instal·lació personalitzada"
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "Escriptori IceWm"
+msgstr "Escriptori KDE"
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "Escriptori IceWm"
+msgstr "Escriptori GNOME"
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "Escriptori IceWm"
+msgstr "Escriptori personalitzat"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
-msgstr ""
+msgstr "Aquesta és una previsualització de l'escriptori '%s'."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
-msgstr ""
+msgstr "Feu clic a les imatges per a veure una previsualització més gran."
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Selecció del grup de paquets"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Selecció individual de paquets"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Mida total: %d / %d MB"
+msgid "Unselect All"
+msgstr "Desselecciona-ho tot"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Paquet incorrecte"
+msgid "Total size: %d / %d MB"
+msgstr "Mida total: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versió: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
-msgstr "Mida:"
+msgstr "Mida: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d kB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
-msgstr "Importància:"
+msgstr "Importància: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "No podeu seleccionar/desseleccionar aquest paquet"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
-msgstr "degut a que falten %s"
+msgstr "a causa que falten %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
-msgstr "degut a %s no satisfetes"
+msgstr "per culpa de %s no satisfetes"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
-msgstr ""
+msgstr "s'està intentant promoure %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "per tal de mantenir %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "No podeu seleccionar aquest paquet perquè no queda prou espai per instal·lar-"
 "lo"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Ara s'instal·laran els paquets següents"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Ara s'eliminaran els paquets següents"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Aquest paquet és obligatori; no es pot desseleccionar"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "No podeu desseleccionar aquest paquet; ja està instal·lat"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "No podeu desseleccionar aquest paquet; s'ha d'actualitzar"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Mostra automàticament els paquets seleccionats"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instal·la"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Carrega/Desa la selecció"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "S'està actualitzant la selecció de paquets"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Instal·lació mínima"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
-msgstr "Gestor de programari"
+msgstr "Gestió de programari"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Escolliu els paquets que voleu instal·lar"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "S'està instal·lant"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Sense detalls"
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "Temps restant "
+msgstr "Temps restant:"
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "S'està estimant"
+msgstr "(s'està estimant...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d paquet"
 msgstr[1] "%d paquets"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Resum"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configura"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "no configurat(da)"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Selecció del grup de paquets"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
+"S'han trobat els següents suports d'instal·lació.\n"
+"Si en voleu ometre alguns, els podeu desseleccionar ara."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
+"Teniu l'opció de copiar el contingut dels CD al disc dur abans de la "
+"instal·lació.\n"
+"Llavors es continuarà des del disc dur i els paquets continuaran disponibles "
+"un cop el sistema estigui instal·lat."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
-msgstr "Copia els CDs sencers"
+msgstr "Copia els CD sencers"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "S'ha produït un error"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Si us plau, seleccioneu la disposició del vostre teclat"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "Aquesta és la llista completa de teclats disponibles"
+msgstr "Aquesta és la llista completa de teclats disponibles:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instal·la/Actualitza"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Es tracta d'una instal·lació o d'una actualització?"
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
-msgstr "Instal·la"
+msgstr "Instal·lació"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Actualitza %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clau de xifratge per a %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
-msgstr ""
+msgstr "Cancel·la la instal·lació, reinicia el sistema"
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "S'està instal·lant"
+msgstr "Nova instal·lació"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
-msgstr ""
+msgstr "Actualitza la instal·lació anterior (no recomanable)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1045,39 +1244,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
+"L'instal·lador ha detectat que el vostre Linux instal·lat no es pot "
+"actualitzar a %s de forma segura.\n"
+"\n"
+"Es recomana una nova instal·lació que substitueixi l'anterior.\n"
+"\n"
+"Avís: hauríeu de fer una còpia de seguretat de les vostres dades personals "
+"abans de triar «Nova instal·lació»."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "S'està configurant l'IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"No hi ha prou espai lliure per un 1MB de bootstrap! La instal·lació "
-"continuarà, però per iniciar el sistema necessitareu crear la partició de "
-"bootstrap amb el DiskDrake"
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"No hi ha prou espai lliure per un 1MB de bootstrap! La instal·lació "
-"continuarà, però per iniciar el sistema necessitareu crear la partició de "
-"bootstrap amb el DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1086,79 +1271,80 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "Canvieu el Cd-Rom!\n"
-"Si us plau, inseriu el CD-ROM etiquetat com \"%s\" a la unitat i després\n"
+"Si us plau, inseriu el CD-ROM etiquetat com «%s» a la unitat i després\n"
 "premeu D'acord.\n"
 "Si no el teniu, premeu Cancel·la per no fer la instal·lació des d'aquest Cd-"
 "Rom."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "S'estan cercant els paquets disponibles..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
+"El vostre sistema no té prou espai de disc lliure per a la instal·lació o "
+"actualització (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
-#, fuzzy, c-format
+#: steps_interactive.pm:428
+#, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"Si us plau, carregueu o deseu la selecció de paquets en el disquet.\n"
-"El format és el mateix que en els disquets generats d'instal·lació "
-"automàtica."
+"Trieu carregar o desar la selecció de paquets.\n"
+"El format és el mateix que el dels fitxers generats per auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
-msgstr "Càrrega"
+msgstr "Carrega"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Desa"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Fitxer incorrecte"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "Selecció del grup de paquets"
+msgstr "Selecció de l'escriptori"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
-msgstr ""
+msgstr "Podeu triar el vostre perfil d'escriptori d'estació de treball."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "La mida seleccionada és superior a la disponible"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipus d'instal·lació"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1167,87 +1353,115 @@ msgstr ""
 "No heu seleccionat cap grup de paquets.\n"
 "Escolliu la instal·lació mínima que voleu:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Amb X"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "S'està instal·lant el paquet %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr "Instal·la els paquets recomanats"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Amb la documentació bàsica (recomanat!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instal·lació realment mínima (especialment no urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "S'està preparant l'actualització..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "S'està preparant la instal·lació"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "S'està instal·lant el paquet %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "S'ha produït un error en ordenar els paquets:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
-msgstr "Voleu seguir igualment?"
+msgstr "Voleu continuar igualment?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Reintenta"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
-msgstr ""
+msgstr "Omet aquest paquet"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
-msgstr ""
+msgstr "Omet tots els paquets del suport «%s»"
 
-#: steps_interactive.pm:680
-#, fuzzy, c-format
+#: steps_interactive.pm:682
+#, c-format
 msgid "Go back to media and packages selection"
-msgstr "Desa la selecció de paquets"
+msgstr "Torna enrere cap a la selecció de suports i paquets"
 
-#: steps_interactive.pm:683
-#, fuzzy, c-format
+#: steps_interactive.pm:685
+#, c-format
 msgid "There was an error installing package %s."
-msgstr "S'ha produït un error en instal·lar els paquets:"
+msgstr "S'ha produït un error en la instal·lació del paquet %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuració posterior a la instal·lació"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
-msgstr ""
+msgstr "Assegureu-vos que el suport Actualitza Mòduls és a la unitat %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Actualitzacions"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Ara teniu l'oportunitat de configurar mitjans en línia."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Això us permet instal·lar actualitzacions de seguretat."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Per configurar aquests mitjans, us caldrà tenir una connexió a Internet "
+"funcional.\n"
+"\n"
+"Voleu configurar el mitjà d'actualització?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1269,131 +1483,120 @@ msgstr ""
 "\n"
 "Voleu instal·lar les actualitzacions?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s a %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Maquinari"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Targeta de so"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Teniu una targeta de so ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
-"Executeu \"alsacont\" després de la instal·lació per configurar la targeta "
-"de so"
+"Executeu «alsacont» o bé «sndconfig» després de la instal·lació per "
+"configurar la targeta de so"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
-"No s'ha detectat cap targeta de so. Proveu amb \"harddrake\" després de la "
+"No s'ha detectat cap targeta de so. Proveu amb «harddrake» després de la "
 "instal·lació"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfície gràfica"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Xarxa i Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Intermediaris"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "configurat"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
-msgstr "Nivell de seguretat:"
+msgstr "Nivell de seguretat"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Tallafoc"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "activat"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
-msgstr "inhabilita"
+msgstr "inhabilitat"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "No heu configurat X. Segur que ho voleu així?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "S'està preparant el carregador de l'arrencada..."
+msgid "Preparing initial startup program..."
+msgstr "S'està preparant el programa d'arrencada..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
-msgstr ""
-
-#: steps_interactive.pm:1038
-#, fuzzy, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Sembla que teniu un OldWorld o una màquina\n"
-"desconeguda; el carregador d'arrencada yaboot no us funcionarà.\n"
-"La instal·lació continuarà, però us caldrà utilitzar el BootX\n"
-"o algun altre mètode per arrencar l'ordinador"
+msgstr "Tingueu paciència, això pot trigar una estona..."
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
-"En quest nivell de seguretat, l'accés a les particions de Windows està "
+"En aquest nivell de seguretat, l'accés a les particions de Windows està "
 "restringit a l'administrador."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Inseriu un disquet en blanc a la unitat %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
-msgstr "S'està creant el disquet d'instal·lació automàtica"
+msgstr "S'està creant el disquet d'instal·lació automàtica..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1402,14 +1605,14 @@ msgid ""
 msgstr ""
 "Alguns passos no s'han completat.\n"
 "\n"
-"Segur que voleu sortir ara?"
+"Esteu segur que voleu sortir ara?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Felicitats"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Reinicia"
@@ -1420,12 +1623,12 @@ msgstr "Reinicia"
 msgid ""
 "_: Keep these entry short\n"
 "Language"
-msgstr "Escolliu el vostre idioma"
+msgstr "Idioma"
 
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "Localització"
 
 #: steps_list.pm:17
 #, c-format
@@ -1453,7 +1656,7 @@ msgstr "Detecció del disc dur"
 msgid ""
 "_: Keep these entry short\n"
 "Installation class"
-msgstr ""
+msgstr "Classe d'instal·lació"
 
 #: steps_list.pm:23
 #, c-format
@@ -1481,21 +1684,21 @@ msgstr "Particionament"
 msgid ""
 "_: Keep these entry short\n"
 "Formatting"
-msgstr ""
+msgstr "Formatació"
 
 #: steps_list.pm:29
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Choosing packages"
-msgstr ""
+msgstr "Tria de paquets"
 
 #: steps_list.pm:31
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Installing"
-msgstr "S'està instal·lant"
+msgstr "Instal·lació"
 
 #: steps_list.pm:34
 #, c-format
@@ -1504,13 +1707,6 @@ msgid ""
 "Users"
 msgstr "Usuaris"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Xarxa"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1523,7 +1719,7 @@ msgstr "Carregador d'arrencada"
 msgid ""
 "_: Keep these entry short\n"
 "Configure X"
-msgstr "Configura l'X"
+msgstr "Configura les X"
 
 #: steps_list.pm:42
 #, c-format
@@ -1552,155 +1748,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Surt"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programes d'ofimàtica: processadors de textos (kword, abiword), fulls de "
-#~ "càlcul (kspread, gnumeric), visualitzadors pdf, etc."
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "S'està descarregant el fitxer %s..."
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Heu seleccionat el(s) servidor(s) següent(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Aquests servidors estan activats per defecte. No tenen cap problema de "
-#~ "seguretat\n"
-#~ "conegut, però se'n podrien trobar de nous. Si fos així, caldrà que els "
-#~ "actualitzeu\n"
-#~ "tan aviat com sigui possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Voleu realment instal·lar aquests servidors?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "Escriptori IceWm"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr ""
-#~ "S'està contactant amb la rèplica per obtenir la llista dels paquets "
-#~ "disponibles..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "No es pot contactar amb la rèplica: %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Genera un disquet per a la instal·lació automàtica"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "Si ho desitgeu, la instal·lació automàtica es pot\n"
-#~ "automatitzar completament, però en aquest cas\n"
-#~ "prendrà el control del disc dur!\n"
-#~ "(Això està pensat per a la instal·lació en un altre ordinador.)\n"
-#~ "\n"
-#~ "Potser preferireu repetir la instal·lació.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Repeteix"
-
-#~ msgid "Automated"
-#~ msgstr "Automàtica"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Desa la selecció de paquets"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Voleu utilitzar l'aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "S'ha produït un error en instal·lar l'aboot. \n"
-#~ "Voleu intentar igualment la instal·lació encara que això destrueixi la "
-#~ "primera partició?"
-
-#~ msgid "All"
-#~ msgstr "Tot"
-
-#~ msgid "TV card"
-#~ msgstr "Targeta de TV"
-
-#~ msgid "Boot"
-#~ msgstr "Arrencada"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Autenticació"
-
-#~ msgid "Gwenview"
-#~ msgstr "Gwenview"
-
-#, fuzzy
-#~ msgid "Invictus Firewall"
-#~ msgstr "Tallafocs interactiu"
-
-#~ msgid "DrakVPN"
-#~ msgstr "DrakVPN"
-
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "(%d paquet, %d MB)"
-#~ msgstr[1] "(%d paquets, %d MB)"
-
-#~ msgid "%d packages"
-#~ msgstr "%d paquets"
-
-#~ msgid "Language"
-#~ msgstr "Escolliu el vostre idioma"
-
-#~ msgid "License"
-#~ msgstr "Llicència"
-
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "Tipus d'instal·lació"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "S'està estimant"
-
-#, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "Paquets a instal·lar"
-
-#~ msgid "Users"
-#~ msgstr "Usuaris"
-
-#~ msgid "Networking"
-#~ msgstr "Xarxa"
-
-#~ msgid "Configure X"
-#~ msgstr "Configura l'X"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "No es pot accedir als mòduls del nucli corresponents al vostre nucli (no "
-#~ "s'ha trobat el fitxer %s). Això generalment vol dir que el vostre disquet "
-#~ "d'arrencada no està sincronitzat amb el suport d'instal·lació (si us "
-#~ "plau, creeu un nou disquet d'arrencada)"
diff --git a/perl-install/install/share/po/cs.po b/perl-install/install/share/po/cs.po
index 663f63ca2..de886ab32 100644
--- a/perl-install/install/share/po/cs.po
+++ b/perl-install/install/share/po/cs.po
@@ -1,56 +1,83 @@
-# Translation of cs.po to Czech
-# Copyright (C) 1999,2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Radek Vybiral <Radek.Vybiral@vsb.cz>, 2000, 2001-2003.
-# Michal Bukovjan <bukm@centrum.cz>, 2002-2003, 2004, 2005, 2006, 2007, 2008, 2009.
+# Translators:
+# Jiří Vírava <appukonrad@gmail.com>, 2013
+# Jiří Vírava <appukonrad@gmail.com>, 2013-2014
+# fri, 2013,2015
 msgid ""
 msgstr ""
-"Project-Id-Version: cs\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-09-17 23:59+0200\n"
-"Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
-"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-06-20 12:05+0000\n"
+"Last-Translator: fri\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/mageia/language/"
+"cs/)\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Vaše pracovní prostředí na USB klí�i"
+msgid "Join Us!"
+msgstr "Připojte se k nám!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Distribuce Mageia Linux se 100%% otevřenými zdrojovými kódy"
+msgid "Make it yours!"
+msgstr "U�iňte systém svým!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Zkoumejte Linux jednoduše díky Mageia One"
+msgid "Your choice!"
+msgstr "Dle vašeho výběru!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Plné pracovní prostředí Mageia Linux, s podporou"
+msgid "Office tools"
+msgstr "Kancelářské nástroje"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: distribuce pro potřeby všech"
+msgid "Home entertainment"
+msgstr "Domácí zábava"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Pro děti"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Pro rodinu"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Pro vývojáře"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Děkujeme"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Svobodu!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Máte ještě nějaké další doplňující zdroje?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -63,90 +90,88 @@ msgstr ""
 "\n"
 "Chcete nastavit ještě nějaké další doplňující instala�ní zdroje?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Síť (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Síť (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Síť (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL zrcadla?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL musí za�ínat na ftp:// nebo http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "Kontaktuji web Mageia Linux pro získání seznamu dostupných zrcadel..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr ""
+"Navazuje se spojení se stránkami %s za ú�elem získání seznamu zrcadel..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr ""
-"Selhalo kontaktování webu Mageia Linux pro získání seznamu dostupných zrcadel"
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr "Nepodařilo se kontaktovat stránky %s a stáhnout seznam zrcadel"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
-msgstr "Zvolte si zrcadlo (mirror) pro stahování balí�ků"
+msgstr "Zvolte si zrcadlo pro stahování balí�ků"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Nastavení NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
-msgstr "Zadejte prosím název po�íta�e a adresář vašeho zařízení NFS"
+msgstr "Zadejte, prosím, název po�íta�e a adresář vašeho zařízení NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Chybí název po�íta�e"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Adresář musí za�ínat znakem \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Název po�íta�e připojení NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Adresář"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Dodate�ný"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -155,23 +180,98 @@ msgstr ""
 "Nelze nalézt soubor hdlist na tomto zrcadle. Ujistěte se, že umístění je "
 "správné."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Vydání Core"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Vydání Tainted"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Vydání Nonfree"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Některé sou�ástky ve vašem stroji potřebují nesvobodné mikroprogramové "
+"vybavení (firmware), aby ovlada�e svobodných programů pracovaly."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Měli byste povolit \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" obsahuje různé kousky systému a jeho programů"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" obsahuje nesvobodný software.\n"
+
+#: any.pm:477
+#, 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 ""
+"Obsahuje také mikroprogramové vybavení (firmware) potřebné pro funkci "
+"ur�itých zařízení (např.: některé grafické karty ATI/AMD, některé síťové "
+"karty, některé karty RAID, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" obsahuje software, který nemůže být distribuován ve všech zemích "
+"kvůli softwarovým patentům."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"Obsahuje také software z \"%s\", znovu sestavený s doplňujícími funkcemi."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Zde můžete, pokud chcete, povolit více zdrojů."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Tyto zdroje poskytují aktualizace balí�ků pro \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
-msgstr "Prohledávám již instalované balí�ky..."
+msgstr "Prohledávají se již nainstalované balí�ky..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
-msgstr "Vyhledávám balí�ky pro aktualizaci..."
+msgstr "Vyhledávají se balí�ky pro aktualizaci..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Odstraňují se balí�ky před aktualizací..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -184,87 +284,87 @@ msgstr ""
 "\n"
 "Opravdu chcete odebrat tyto balí�ky?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Chyba při �tení souboru %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Následující disk(y) byly přejmenovány:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (předchozí název %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Síť"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
-msgstr "Prosím vyberte zdroj"
+msgstr "Vyberte, prosím, zdroj"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Soubor již existuje. Přepsat?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Přístup odepřen"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Chybný název NFS"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Chybný zdroj %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Nelze provést sejmutí obrazovky před rozdělením disků"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Sejmuté obrazovky budou dostupné po instalaci v adresáři %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalace"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Nastavení"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Musíte také naformátovat %s"
@@ -275,36 +375,36 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"Některé �ásti vašeho hardware potřebují pro svoji práci 'proprietární' "
+"Některé sou�ástky ve vašem po�íta�i potřebují pro svoji práci 'proprietární' "
 "ovlada�e.\n"
 "Další informace o těchto ovlada�ích můžete nalézt na: %s"
 
 #: interactive.pm:22
 #, c-format
 msgid "Bringing up the network"
-msgstr "Startuji síť"
+msgstr "Spouští se síť"
 
 #: interactive.pm:27
 #, c-format
 msgid "Bringing down the network"
-msgstr "Zastavuji síť"
+msgstr "Zastavuje se síť"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
-msgstr "Prosím po�kejte, získávám soubor"
+msgstr "Prosím po�kejte, získává se soubor"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "nelze přidat zdroj"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
-msgstr "Kopíruji některé balí�ky na disky pro budoucí použití"
+msgstr "Kopírují se některé balí�ky na disky pro budoucí použití"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Probíhá kopírování"
@@ -334,7 +434,23 @@ msgstr "nedůležité"
 msgid "maybe"
 msgstr "může se hodit"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Získávají se informace o balíku z popisných dat XML..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Chybí XML informace pro zdroj \"%s\", pouze �áste�ný výsledek pro balí�ek %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Žádný popis"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -343,343 +459,412 @@ msgstr ""
 "Některé z balí�ků vyžádaných od %s nelze nainstalovat:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Nastala chyba:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Vyskytla se fatální chyba: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Více se již neptat"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instala�ních procesů selhalo"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Instalace balí�ků selhala:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Pracovní stanice"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Kancelářská stanice"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programy pro kancelář: textové procesory (OpenOffice.org Writer, Kword), "
-"tabulkové procesory (OpenOffice.org Calc, Kspread), prohlíže�e PDF a další"
+"Programy pro kancelář: textové procesory (LibreOffice Writer, Kword), "
+"tabulkové procesory (LibreOffice Calc, Kspread), prohlíže�e PDF a další"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Hry"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zábavné programy: deskové hry, strategie, atd."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediální stanice"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
-msgstr "Programy pro přehrávání/editaci zvuku a videa"
+msgstr "Programy pro přehrávání/upravování zvuku a obrazu"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internetová stanice"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
-"Soubor nástrojů pro �tení a posílaní el. pošty a příspěvků do diskusních "
-"skupin (mutt, tin..) a pro prohlížení Webu"
+"Soubor nástrojů pro �tení a posílaní elektronické pošty a příspěvků do "
+"diskusních skupin (mutt, tin..) a pro prohlížení Webu"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Síťový po�íta� (klient)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienti pro různé verze protokolu ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Nástroje pro snadnou konfiguraci po�íta�e"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konzolové nástroje"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editory, shelly, souborové nástroje, terminály"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Vývoj"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Knihovny pro vývoj v C a C++, programy a hlavi�kové soubory"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentace"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
-msgstr "Knihy a Howto o Linuxu a Svobodném Software"
+msgstr "Knihy a praktické rady, jak na to, o Linuxu a Svobodném Software"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Standardní Báze Linuxu (LSB): Podpora aplikací jiných dodavatelů"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Webový server"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Server Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internetová brána"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Pošta/Diskusní skupiny"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Poštovní server Postfix, server diskusních skupin Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Server adresářových služeb"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Server pro domény a síťové informace"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Server pro sdílení souborů a tiskáren"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server NFS, server Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Databáze"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Databázové servery PostgreSQL a MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Databázové servery PostgreSQL a MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache a Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Pošta"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Poštovní server Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Databázové servery PostgreSQL nebo MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Databázové servery PostgreSQL nebo MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Síťový server"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafické prostředí"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Pracovní stanice s KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
-"K Desktop Environment, základní grafické prostředí s kolekcí doprovodných "
+"K Desktop Environment, základní grafické prostředí se sbírkou doprovodných "
 "nástrojů"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Pracovní stanice s GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
+msgstr "Grafické prostředí s uživatelsky přívětivou sadou aplikací a nástrojů"
+
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Pracovní stanice s XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Jednoduché grafické prostředí s uživatelsky přívětivou sadou aplikací a "
+"nástrojů"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Pracovní stanice s MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Pracovní stanice s Cinnamonem"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Grafické prostředí založené na GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "LXQT Desktop"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Příští generace QT, převedení lehkého prostředí pracovní plochy"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Pracovní prostředí s  Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
 msgstr ""
-"Grafické prostředí s uživatelsky přívětivým seskupením aplikací a pracovní "
-"plochou"
+"Lehké a rychlé grafické prostředí s uživatelsky přívětivou sadou aplikací a "
+"nástrojů"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE Desktop"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Lehké a rychlé grafické prostředí"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Pracovní plocha Plasma"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Jednoduché a rychlé grafické prostředí s uživatelsky přívětivou sadou "
-"aplikací a nástrojů"
+"Pracovní plocha Plasma je základní grafické prostředí se sbírkou "
+"doprovodných nástrojů"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
-msgstr "Další grafické desktopy"
+msgstr "Další grafická prostředí"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm a další"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm a další"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Užite�né nástroje"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Server SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Server pro vzdálené nastavení Webminu"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Síťové nástroje/Sledování"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Nástroje pro sledování, evidenci procesů, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
-msgstr "Průvodci Mageia"
+msgstr "Průvodci nastavením Mageii"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Průvodci nastavením serverů"
@@ -690,10 +875,10 @@ msgid ""
 "An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"Stala se chyba, ale nevím, jak jí správně interpretovat.\n"
-"Pokra�ujte na vlastní riziko."
+"Stala se chyba, ale neví se, jak ji správně vykládat.\n"
+"Pokra�ujte na vlastní nebezpe�í."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -701,236 +886,240 @@ msgid ""
 "Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
 msgstr ""
-"Některé důležité balí�ky nebyly správně nainstalované.\n"
+"Některé důležité balí�ky nebyly správně nainstalovány.\n"
 "Je možné, že je poškozen CD disk nebo CD-ROM mechanika.\n"
 "Zkontrolujete to použitím příkazu \"rpm -qpl media/main/*.rpm\"\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
 msgid "Entering step `%s'\n"
-msgstr "Za�ínám krok '%s'\n"
+msgstr "Za�íná se krok '%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux Instalace %s"
+msgid "%s Installation %s"
+msgstr "%s instalace %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> mezi prvky"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
-msgstr "Server Xorg startuje delší dobu. Prosím po�kejte..."
+msgstr "Server Xorg se spouští delší dobu. Prosím po�kejte..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Váš systém má málo systémových prostředků. Při instalaci Mageia Linuxu se\n"
-"můžete setkat s různými problémy. Pokud se tak stane, zkuste textovou\n"
-"verzi instala�ního programu. Ta se spouští tak, že při startu\n"
-"z CD mechaniky stisknete 'F1' a poté napíšete 'text'."
+"Váš systém nemusí mít dostate�né vybavení pro bezproblémovou instalaci %s. V "
+"případě potíží zvolte instalaci v textovém režimu. Pro její spuštění "
+"stiskněte při nabíhání systému z CD klávesu 'F1' a následně napište 'text'."
+
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr "Výběr zdrojů"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Instalovat pracovní prostředí Mageia KDE"
+msgid "Install %s KDE Desktop"
+msgstr "Instalovat %s prostředí KDE"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Instalovat pracovní prostředí Mageia GNOME"
+msgid "Install %s GNOME Desktop"
+msgstr "Instalovat %s prostředí GNOME"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Vlastní instalace"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
-msgstr "KDE Desktop"
+msgstr "Prostředí KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
-msgstr "GNOME Desktop"
+msgstr "Prostředí GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
-msgstr "Vlastní desktop"
+msgstr "Vlastní prostředí"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Zde se nachází náhled pracovního prostředí %s."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klepněte na obrázky, chcete-li vidět větší náhled"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Výběr skupiny balí�ků"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Výběr jednotlivých balí�ků"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Celková velikost: %d / %d MB"
+msgid "Unselect All"
+msgstr "Zrušit celý výběr"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Špatný balí�ek"
+msgid "Total size: %d / %d MB"
+msgstr "Celková velikost: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Verze: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Velikost: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Důležitost: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Nemůžete vybrat/nevybrat tento balí�ek"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "protože chybí %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "díky nesplněné závislosti %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokus o postoupení %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "aby bylo zachováno %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Nemůžete vybrat tento balí�ek, protože pro jeho instalaci není dost místa"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Budou instalovány tyto balí�ky"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Budou odebrány tyto balí�ky"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Toto je povinný balí�ek, nemůže být odstraněn"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Nemůžete odzna�it tento balí�ek, je už nainstalovaný"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Tento balí�ek musí být aktualizován, nemůžete ho odzna�it"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Ukázat automaticky vybrané balí�ky"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalovat"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Na�íst/Uložit výběr"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
-msgstr "Aktualizuji výběr balí�ků"
+msgstr "Aktualizuje se výběr balí�ků"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
-msgstr "Minimální instalace"
+msgstr "Nejmenší instalace"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Správa softwaru"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Vyberte si balí�ky, které chcete nainstalovat"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
-msgstr "Instaluji"
+msgstr "Instaluje se"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Bez podrobností"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Zbývající �as:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
-msgstr "(odhaduji...)"
+msgstr "(odhaduje se...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
@@ -938,27 +1127,22 @@ msgstr[0] "%d balí�ek"
 msgstr[1] "%d balí�ky"
 msgstr[2] "%d balí�ků"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Souhrn"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Nastavit"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "nenastaveno"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Výběr zdrojů"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -967,84 +1151,84 @@ msgstr ""
 "Byla nalezeny následující instala�ní zdroje.\n"
 "Pokud chcete některé z nich vynechat, můžete je nyní odzna�it."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Máte možnost před instalací zkopírovat obsah CD na pevný disk.\n"
 "Instalace pak bude pokra�ovat z pevného disku a balí�ky zůstanou dostupné i "
 "poté, co je systém plně nainstalován."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopírovat celá CD"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Stala se chyba"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Vyberte si rozložení vaší klávesnice"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Zde je úplný seznam dostupných klávesnic:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalace/Aktualizace"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Jedná se o instalaci nebo aktualizaci?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalace"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Aktualizace %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Šifrovací klí� pro %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Zrušit instalaci, restartovat systém"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Nová instalace"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Aktualizace předchozí instalace (nedoporu�uje se)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1052,45 +1236,26 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Instalátor zjistil, že váš instalovaný systém Mageia Linux nemůže být\n"
-"bezpe�ně povýšen na %s.\n"
+"Instalátor zjistil, že nainstalovaný systém Mageia Linux nemůže \n"
+"být bezpe�ně povýšen na %s.\n"
 "\n"
-"Doporu�ujeme novou instalaci, která nahradí instalaci stávající.\n"
+"Proto doporu�ujeme provést novou instalaci a nahradit tak zcela \n"
+"instalaci původní.\n"
 "\n"
-"Varování: před volbou \"Nové instalace\" si zazálohujte veškerá vaše\n"
-"osobní data."
+"Varování: měli byste zálohovat veškerá data před tím, než \n"
+"spustíte \"Novou instalaci.\""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
-msgstr "Nastavuji IDE"
-
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Pro bootstrap není potřebné místo o velikosti 1MB! Instalace může "
-"pokra�ovat, ale pro spuštění systému musíte vytvořit bootstrap oddíl pomocí "
-"DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Je nutné vytvořit zavedení PPC PReP Boot! Instalace může pokra�ovat, ale pro "
-"zavedení systému musíte vytvořit zaváděcí oddíl pomocí DiskDrake"
+msgstr "Nastavuje se IDE"
 
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1102,12 +1267,12 @@ msgstr ""
 "Prosím vložte CD ozna�ené \"%s\" do mechaniky a stiskněte Ok.\n"
 "Pokud toto CD nemáte, stiskněte Zrušit a toto CD nebude nainstalováno."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
-msgstr "Hledám dostupné balí�ky..."
+msgstr "Hledají se dostupné balí�ky..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1116,7 +1281,7 @@ msgstr ""
 "Váš systém nemá dostatek volného místa pro instalaci nebo aktualizaci (%dMB "
 "> %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1125,143 +1290,171 @@ msgstr ""
 "Vyberte si, zda chcete uložit nebo na�íst výběr balí�ků.\n"
 "Formát je stejný jako u souborů generovaných pomocí auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Na�íst"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Uložit"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Chybný soubor"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Výběr pracovního prostředí"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Můžete vybrat profil vašeho pracovního prostředí."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Velikost vybraných balí�ků je větší než místo na disku"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Typ instalace"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 "Nevybrali jste žádnou skupinu balí�ků.\n"
-"Vyberte si prosím alespoň minimální instalaci:"
+"Vyberte si, prosím, alespoň nejmenší instalaci:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X prostředí"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Instalovat navrhované balí�ky"
+msgid "Install recommended packages"
+msgstr "Instalovat doporu�ené balí�ky"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Základní dokumentace (doporu�eno!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
-msgstr "Opravdu minimální instalace (speciálně bez urpmi)"
+msgstr "Opravdu nejmenší instalace (speciálně bez urpmi)"
+
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Připravuje se povýšení..."
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
-msgstr "Připravuji instalaci"
+msgstr "Připravuje se instalace"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
-msgstr "Instaluji balí�ek %s"
+msgstr "Instaluje se balí�ek %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Stala se chyba při řazení balí�ků:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Přesto pokra�ovat?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Zkusit znovu"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Vynechat tento balí�ek"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Vynechat všechny balí�ky ze zdroje \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Vrátit se zpět k výběru zdrojů a balí�ků"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Při instalaci balí�ku %s nastala chyba."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Probíhá nastavování po instalaci"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
-"Ujistěte se prosím, že se médium s aktualizovanými moduly nachází v jednotce "
-"%s"
+"Ujistěte se, prosím, že se médium s aktualizovanými moduly nachází v "
+"jednotce %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Aktualizace"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Nyní máte příležitost nastavit internetová média."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Toto dovolí instalaci bezpe�nostních aktualizací."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"K nastavení těchto médií budete potřebovat pracující internetové\n"
+"spojení.\n"
+"\n"
+"Chcete nastavit aktualiza�ní média?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1278,32 +1471,33 @@ msgstr ""
 "aktualizace nebo opravy chyb.\n"
 "\n"
 "Chcete-li získat tyto balí�ky, musíte mít k dispozici funk�ní připojení\n"
-"k Internetu.\n"
+"k internetu.\n"
 "\n"
 "Chcete nainstalovat aktualizace?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Zvuková karta"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Máte nějakou zvukovou kartu na ISA sběrnici?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1312,101 +1506,89 @@ msgstr ""
 "Pro nastavení zvukové karty spusťte po instalaci \"alsaconf\" nebo "
 "\"sndconfig\""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Nebyla nalezena zvuková karta. Zkuste spustit po instalaci \"harddrake\"."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafické rozhraní"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
-msgstr "Síť & Internet"
+msgstr "Síť a internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxy"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "nastaveno"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Úroveň zabezpe�ení"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
-msgstr "aktivováno"
+msgstr "zapnuto"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "vypnuto"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Nemáte nastaveno prostředí X. Chcete jej skute�ně ponechat nenastavené?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Připravuji zaváděcí program..."
+msgid "Preparing initial startup program..."
+msgstr "Přípravuje se spouštěcí program..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Prosím o strpení, může to chvíli trvat…"
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Zdá se, že máte po�íta� OldWorld nebo jiný, neznámý, na kterém nebude "
-"zavadě� Yaboot pracovat. Instalace bude pokra�ovat, ale budete potřebovat "
-"BootX nebo jiný nástroj pro zavedení systému. Parametr jádra pro kořenový "
-"souborový systém je: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
-"V této úrovní zabezpe�ení je přístup k souborům na oddíle s Windows omezena "
+"V této úrovní zabezpe�ení je přístup k souborům na oddíle s Windows omezen "
 "pouze na uživatele administrátor."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Vložte prázdnou disketu do %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
-msgstr "Vytvářím disketu pro automatickou instalaci..."
+msgstr "Vytváří se disketa pro automatickou instalaci..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1417,12 +1599,12 @@ msgstr ""
 "\n"
 "Chcete opravdu nyní skon�it?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
-msgstr "Gratulujeme"
+msgstr "Blahopřejeme"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Restartovat"
@@ -1459,7 +1641,7 @@ msgstr "Myš"
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
-msgstr "Detekce pevných disků"
+msgstr "Zjištění pevných disků"
 
 #: steps_list.pm:21 steps_list.pm:22
 #, c-format
@@ -1508,7 +1690,7 @@ msgstr "Výběr balí�ků"
 msgid ""
 "_: Keep these entry short\n"
 "Installing"
-msgstr "Instaluji"
+msgstr "Instaluje se"
 
 #: steps_list.pm:34
 #, c-format
@@ -1517,13 +1699,6 @@ msgid ""
 "Users"
 msgstr "Uživatelé"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Sítě"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1565,35 +1740,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Konec"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programy pro kancelář: textové procesory (KWord, Abiword), tabulkové "
-#~ "procesory (KSpread, Gnumeric), prohlíže�e PDF a další"
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Rozhodli jste se aktualizovat váš systém na %s. Na vašem systému bylo "
-#~ "nalezeno\n"
-#~ "prostředí KDE 3.5. Instalátor nemůže prostředí KDE 3.5 při aktualizaci "
-#~ "zachovat. Pokud budete pokra�ovat,\n"
-#~ "bude prostředí KDE 3 nahrazeno verzí KDE 4 a ztratíte tak svá osobní "
-#~ "nastavení prostředí KDE.\n"
-#~ "Chcete-li provést aktualizaci a zachovat svá osobní nastavení, "
-#~ "restartujte prosím systém\n"
-#~ "a aktualizujte systém pomocí apletu pro aktualizaci distribuce Mandriva."
-
-#~ msgid "Proceed"
-#~ msgstr "Pokra�ovat"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "získání [%s] selhalo"
diff --git a/perl-install/install/share/po/cy.po b/perl-install/install/share/po/cy.po
index 74fa527ba..a047e53f8 100644
--- a/perl-install/install/share/po/cy.po
+++ b/perl-install/install/share/po/cy.po
@@ -5,9 +5,9 @@
 # Rhoslyn Prys <rprys@yahoo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: Mageia Linux\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2009-10-01 16:09+0100\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: Meddal.com\n"
@@ -21,38 +21,63 @@ msgstr ""
 "X-Poedit-Country: UNITED KINGDOM\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Eich bwrdd gwaith ar allwedd USB"
+msgid "Join Us!"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Mageia Linux - y dosbarthiad cod agored 100%%"
+msgid "Make it yours!"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Arbrofi rhwydd gyda Mageia One"
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Gweithfan Swyddfa"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Bwrdd gwaith Mageia Linux llawn, gyda chefnogaeth"
+msgid "Home entertainment"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: dosbarthiad ar gyfer angen pawb"
+msgid "For kids"
+msgstr ""
 
-#: any.pm:109
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Oes gennych unrhyw gyfrwng atodol arall?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -66,89 +91,87 @@ msgstr ""
 "\n"
 "A oes gennych gyfrwng gosod ychwanegol i'w ffurfweddu?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Rhwydwaith (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Rhwydwaith (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Rhwydwaith (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL y drych?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Rhaid i'r URL gychwyn gyda ftp:// neu http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "Cysylltu â safle gwe Mageia Linux i estyn y rhestr o ddrychau..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Cysylltu â safle gwe %s i estyn y rhestr o ddrychau..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr "Methwyd cysylltu â safle gwe Mageia Linux i estyn y rhestr o ddrychau"
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr "Methwyd cysylltu â safle gwe %s i estyn y rhestr o ddrychau"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Dewiswch ddrych lle mae modd estyn y pecynnau"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Ffurfweddiad NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Rhowch enw'r gwesteiwr a chyfeiriadur eich cyfrwng NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Enw gwesteiwr ar goll"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Rhaid i gyfeiriadur gychwyn gyda \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Enw gwesteiwr arosod NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Cyfeiriadur"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Atodol"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -157,23 +180,90 @@ msgstr ""
 "Methu canfod ffeil hdlist ar y drych. Gwnewch yn siwr fod y lleoliad yn "
 "gywir."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, fuzzy, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Hepgor pob pecyn o gyfrwng \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Edrych ar becynnau wedi eu gosod yn barod..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Canfod pecynnau i'w uwchraddio..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Tynnu pecynnau cyn diweddaru..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -187,87 +277,87 @@ msgstr ""
 "\n"
 "Ydych chi am dynnu'r pecynnau hyn?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Gwall wrth ddarllen ffeil %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Mae'r disg(iau) canlynol wedi eu hail enwi:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (ei enw blaenorol oedd %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rhwydwaith"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Dewiswch gyfrwng"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Mae'r ffeil yn bodoli eisoes. Ysgrifennu drosti?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Caniatâd wedi ei wrthod."
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Enw NFS gwael"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Cyfrwng %s gwael"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Meth creu lluniau o'r sgrin cyn rhannu"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Bydd lluniau o'r sgrin ar gael ar ôl gosod yn %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Gosod"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Ffurfweddiad"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Rhaid fformatio %s hefyd"
@@ -291,22 +381,22 @@ msgstr "Cychwyn y rhwydwaith"
 msgid "Bringing down the network"
 msgstr "Cau'r rhwydwaith"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Arhoswch, estyn ffeil"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "methu ychwanegu cyfrwng"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Copïo rhai pecynnau ar ddisg ar gyfer defnydd yn y dyfodol"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Wrthi'n copïo..."
@@ -336,7 +426,24 @@ msgstr "hyfryd"
 msgid "maybe"
 msgstr "efallai"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Dim gwybodaeth xml ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar "
+"gyfer pecyn %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Dim disgrifiad"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -345,66 +452,76 @@ msgstr ""
 "Nid yw'n bosib gosod rhai pecynnau gofynnwyd gan %s:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Digwyddodd gwall:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Digwyddodd gwall terfynol:%s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "Methodd trafod gosod %d"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Methodd gosod pecynnau:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Gweithfan"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Gweithfan Swyddfa"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Rhaglenni swyddfa: prosesydd geiriau (OpenOffice.org Writer, Kword), "
-"taenlenni (OpenOffice.org Calc, Kspread), ddarllenydd pdf, ag ati"
+"Rhaglenni swyddfa: prosesydd geiriau (LibreOffice Writer, Kword), taenlenni "
+"(LibreOffice Calc, Kspread), ddarllenydd pdf, ag ati"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Man chwarae"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Rhaglenni difyrrwch: arcêd, gemau bwrdd, strategaeth, ag ati"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Man aml-gyfrwng"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Chwarae sain a fideo/rhaglenni golygu"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Man rhyngrwyd"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -413,193 +530,193 @@ msgstr ""
 "Casgliad o offer i ddarllen ac anfon e-bost a newyddion (mutt, tin..) ac i "
 "bori'r We"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Cyfrifiadur Rhwydwaith (cleient)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Cleientiaid ar gyfer protocolau amrywiol yn cynnwys ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Offer i wneud ffurfweddu'ch cyfrifiadur yn haws"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Offer y Consol"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Golygyddion, cregyn, offer ffeilio, terfynellau"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Datblygiad"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Llyfrgelloedd datblygiadol C a C++, rhaglenni a ffeiliau cynnwys"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dogfennau"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Llyfrau a Howto's ar Linux a Meddalwedd Rhydd"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Cefnogaeth i raglenni trydydd parti"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Gweinydd Gwe"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Grwpwar"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Gweinydd Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Mur Gwarchod/Llwybrydd"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Porth i'r rhyngrwyd"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "E-bost/Newyddion"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Gweinydd e-bost Postfix, gweinydd newyddion Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Cyfeiriadur Gweinydd"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Gweinydd FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Gweinydd Enw Parth a Gwybodaeth Rhwydwaith"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Gweinydd Ffeil a Rhannu Argraffydd"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Gweinydd NSF, gweinydd Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Gweinydd CronfaDdata PostgreSQL a MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Gweinydd CronfaDdata PostgreSQL a MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Gwe/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "E-bost"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Gweinydd e-bost Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Gweinydd cronfa data PostgreSQL neu MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Gweinydd cronfa data PostgreSQL neu MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Gweinydd NFS, gweinydd SMB, gweinydd dirprwyol, gweinydd ssh"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Amgylchedd Graffig"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Man Gwaith KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -608,12 +725,12 @@ msgstr ""
 "KDE - Amgylchedd Bwrdd gwaith K, yr amgylchedd graffig sylfaenol gyda "
 "chasgliad o offer"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Man Gwaith Gnome"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -622,66 +739,129 @@ msgstr ""
 "Amgylchedd graffig gyda chasgliad o raglenni ac offer bwrdd gwaith hawdd eu "
 "defnyddio."
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "Man Gwaith KDE"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Amgylchedd graffig gyda chasgliad o raglenni ac offer bwrdd gwaith hawdd eu "
+"defnyddio."
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Man Gwaith Gnome"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Gweithfan"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Amgylchedd Graffig"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "Bwrdd Gwaith LXDE"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Amgylchedd graffig ysgafn a chyflym gyda chasgliad o raglenni ac offer bwrdd "
+"gwaith hawdd eu defnyddio."
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Bwrdd Gwaith LXDE"
 
-#: share/meta-task/compssUsers.pl:146
-#, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Amgylchedd graffig ysgafn a chyflym gyda chasgliad o raglenni ac offer bwrdd "
 "gwaith hawdd eu defnyddio."
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Bwrdd Gwaith Addasu"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"KDE - Amgylchedd Bwrdd gwaith K, yr amgylchedd graffig sylfaenol gyda "
+"chasgliad o offer"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Byrddau Gwaith Graffigol Eraill"
 
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:200
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, ag ati"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Gwasanaethau"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Gweinydd SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Gweinydd Ffurfweddiad Pell Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Gwasanaethau Rhwydwaith/Monitro"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Offer monitro, cyfrifo prosesau, tcpdunp, nmap..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Dewiniaid Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Dewiniaid i ffurfweddu gweinydd"
@@ -695,7 +875,7 @@ msgstr ""
 "Digwyddodd gwall ond wn i ddim sut i ddelio ag ef yn dwt.\n"
 "Mae'n beryglus i barhau."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -715,251 +895,251 @@ msgstr "Cychwyn cam '%s\"\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Gosod Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Gosod %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> rhwng elfennau"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Mae gweinydd Xorg yn araf ei gychwyn. Arhoswch..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Mae eich system yn brin o adnoddau. Efallai bod gennych broblem wrth osod\n"
-"Mageia Linux. Os yw hynny'n digwydd, defnyddiwch y gosod testun  yn lle\n"
+"%s. Os yw hynny'n digwydd, defnyddiwch y gosod testun  yn lle\n"
 "hynny. I wneud hynny pwyswch 'F1' wrth gychwyn ar CD-ROM, ac yna teipio "
 "'text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr "Dewis Cyfrwng"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Gosod Bwrdd Gwaith Mageia KDE"
+msgid "Install %s KDE Desktop"
+msgstr "Gosod Bwrdd Gwaith %s KDE"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Gosod Bwrdd Gwaith Mageia GNOME"
+msgid "Install %s GNOME Desktop"
+msgstr "Gosod Bwrdd Gwaith %s GNOME"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Gosodiad addasu"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Bwrdd Gwaith KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Bwrdd Gwaith GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Bwrdd Gwaith Addasu"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Dyma ragolwg o fwrdd gwaith '%s'."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Cliciwch ar y delweddau i weld y rhagolwg yn fwy"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Dewis Grŵp y Pecyn"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Dewis pecynnau unigol."
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Cyfanswm maint: %d / %d MB"
+msgid "Unselect All"
+msgstr "Dad ddewis Popeth"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Pecyn gwallus"
+msgid "Total size: %d / %d MB"
+msgstr "Cyfanswm maint: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Fersiwn:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Maint:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Does dim modd i chi ddewis/dad-ddewis y pecyn"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "oherwydd %s annigonol"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hyrwyddo %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "er mwyn cadw %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Nid oes modd i chi ddewis y pecyn hwn - does dim lle ar ôl i'w osod"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Mae'r pecynnau canlynol i'w gosod"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Bydd y pecynnau canlynol yn cael eu tynnu"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Mae hwn yn becyn hanfodol, does dim modd ei ddad-ddewis"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Does dim mod dad-ddewis y pecyn, mae wedi ei osod yn barod"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Does dim mod dad-ddewis y pecyn hwn. Rhaid ei ddiweddaru"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Dangoswch y pecynnau dewis awtomatig"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Gosod"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Llwytho/Cadw'r dewis"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Diweddaru'r dewis o becynnau"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Gosodiad lleiaf"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Rheoli Meddalwedd"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Dewiswch y pecynnau yr hoffech chi eu gosod"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Gosod"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Dim manylion"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Amser yn weddill:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(amcangyfrif...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pecyn"
 msgstr[1] "%d pecyn"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Crynodeb"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Ffurfweddu"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "heb ffurfweddu"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Dewis Cyfrwng"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -968,12 +1148,12 @@ msgstr ""
 "Mae'r cyfrwng gosod canlynol wedi ei ganfod.\n"
 "Os hoffech hepgor rhai ohonynt, dad-ddewiswch nhw nawr."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Mae gennych y dewis i gopïo cynnwys y CD ar i'r disg caled cyn gosod Mageia "
@@ -981,72 +1161,72 @@ msgstr ""
 "Bydd yna'n parhau o'r disg caled a bydd y pecynnau ar gael unwaith i'r "
 "system gael ei osod yn gyflawn."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copïo'r CDau cyfan"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Digwyddodd gwall"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Dewiswch gynllun eich bysellfwrdd"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Dyma restr lawn o'r bysellfyrddau sydd ar gael:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Gosod/Diweddaru"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Gosod neu ddiweddaru?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Gosod"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Diweddaru %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Allwedd amgryptio ar gyfer %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Atal y gosod, ailgychwyn y system"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Gosodiad Newydd"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Diweddaru'r gosodiad blaenorol (argymell i beidio)"
 
-#: steps_interactive.pm:211
-#, c-format
+#: steps_interactive.pm:223
+#, fuzzy, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1055,43 +1235,24 @@ msgid ""
 "Installation\"."
 msgstr ""
 "Mae'r gosodwr wedi canfod nad yw hi'n ddiogel diweddaru eich system \n"
-"Mageia Linux i %s.\n"
+"Mageia i %s.\n"
 "\n"
 "Mae gosod o'r newydd yn cael ei argymell.\n"
 "\n"
 "Rhybudd : dylech wneud copi wrth gefn o'ch data personol cvyn dewis \"New\n"
 "Installation\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Ffurfweddu IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Nid oes lle rhydd ar gyfer yr ymlwythwr 1MB! Bydd y gosod yn parhau, ond i "
-"gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Bydd angen i chi greu llwythwr mwdwl PPC PReP Boot! Bydd y gosod yn parhau, "
-"ond i gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1103,12 +1264,12 @@ msgstr ""
 "Rhowch y CD-ROM \"%s\" yn eich gyrrwr a chlicio Iawn ar ôl gorffen\n"
 "Os nad yw gennych, cliciwch Diddymu i beidio a gosod o'r CD-ROM."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Casglu'r pecynnau sydd ar gael..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1117,7 +1278,7 @@ msgstr ""
 "Nid oes gan eich system ddigon o le ar gyfer gosod neu ddiweddaru  (%dMB > "
 "%dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1126,52 +1287,52 @@ msgstr ""
 "Dewiswch lwytho neu gadw pecyn dewiswyd.\n"
 "Mae'r fformat yr un â ffeiliau cynhyrchwyd drwy auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Llwyth"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Cadw"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Ffeil gwael"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Dewis Bwrdd Gwaith"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Dewiswch broffil bwrdd gwaith eich man gwaith."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Mae'r maint a ddewiswyd yn fwy na'r lle ar gael"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Math o osod"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1180,87 +1341,111 @@ msgstr ""
 "Nid ydych wedi dewis grwpiau o becynnau.\n"
 "Dewiswch y gosod lleiaf rydych ei eisiau"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Gyda X"
 
-#: steps_interactive.pm:583
-#, c-format
-msgid "Install suggested packages"
+#: steps_interactive.pm:579
+#, fuzzy, c-format
+msgid "Install recommended packages"
 msgstr "Gosod y pecynnau sy'n cael eu hawgrymu"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Gyda dogfennau elfennol (argymell!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Gosod bach iawn (yn arbennig dim urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Paratoi cychwynnwr..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Paratoi'r gosod"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Gosod pecyn %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Roedd gwall wrth drefnu pecynnau:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Mynd yn eich blaen beth bynnag?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Ceisio eto"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Hepgor y pecyn"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Hepgor pob pecyn o gyfrwng \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Mynd yn ôl at ddewis cyfrwng a phecyn"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Digwyddodd gwall wrth osod pecyn: %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Ffurfweddiad ôl osod"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Gwnewch yn siŵr fod cyfrwng Diweddaru Modiwlau yng ngyrrwr %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Diweddaru"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1281,28 +1466,29 @@ msgstr ""
 "\n"
 "Ydych chi am osod y diweddariadau?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s ar %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Caledwedd"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Cerdyn sain"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "A oes gennych gerdyn sain ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1311,80 +1497,68 @@ msgstr ""
 "Rhedwch \"alsaconf\" neu \"sndconfig\" wedi'r gosodiad i ffurfweddu eich "
 "cerdyn sain"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Heb ganfod cerdyn sain. Ceisiwch \"harddrake\" wedi'r gosodiad"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Rhyngwyneb graffigol"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Rhwydwaith a'r Rhyngrwyd"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Dirprwyon"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "ffurfweddwyd"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Lefel Diogelwch"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Mur Cadarn"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "gweithredwyd"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "anablwyd"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Nid ydych wedi ffurfweddu X. Ydych chi'n siŵr eich bod am wneud hyn?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Paratoi cychwynnwr..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Paratoi'r gosod"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Amynedd, gall hyn gymryd amser..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Mae'n ymddangos fod gennych beiriant OldWorld neu Anhysbys ac ni fydd "
-"cychwynnwr yaboot yn gweithio ar eich cyfer Bydd y gosodiad yn parhau ond "
-"bydd rhaid defnyddio BootX i gychwyn eich peiriant. Ymresymiad y cnewyllyn "
-"ar gyfer y gwraidd yw: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1393,17 +1567,17 @@ msgstr ""
 "Ar y lefel diogelwch yma, mae mynedfa i ffeiliau yn rhaniad Windows wedi eu "
 "cyfyngu i'r Gweinyddwr."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Rhowch ddisg meddal  yng ngyrrwr %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Creu disg meddal awto gosod..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1414,12 +1588,12 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau gorffen?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Llongyfarchiadau"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Ail gychwyn"
@@ -1514,13 +1688,6 @@ msgid ""
 "Users"
 msgstr "Defnyddwyr"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Rhwydweithio"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1563,6 +1730,80 @@ msgid ""
 "Exit"
 msgstr "Gorffen"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Paratoi cychwynnwr..."
+
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Amgylchedd graffig ysgafn a chyflym gyda chasgliad o raglenni ac offer "
+#~ "bwrdd gwaith hawdd eu defnyddio."
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Bwrdd Gwaith Addasu"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "Nid oes lle rhydd ar gyfer yr ymlwythwr 1MB! Bydd y gosod yn parhau, ond "
+#~ "i gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "Bydd angen i chi greu llwythwr mwdwl PPC PReP Boot! Bydd y gosod yn "
+#~ "parhau, ond i gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn "
+#~ "DiskDrake"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Mae'n ymddangos fod gennych beiriant OldWorld neu Anhysbys ac ni fydd "
+#~ "cychwynnwr yaboot yn gweithio ar eich cyfer Bydd y gosodiad yn parhau ond "
+#~ "bydd rhaid defnyddio BootX i gychwyn eich peiriant. Ymresymiad y "
+#~ "cnewyllyn ar gyfer y gwraidd yw: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Croeso"
+
+#~ msgid "Select All"
+#~ msgstr "Dewis Popeth"
+
+#~ msgid "Bad package"
+#~ msgstr "Pecyn gwallus"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Paratoi cychwynnwr..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Rhwydweithio"
+
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Eich bwrdd gwaith ar allwedd USB"
+
+#~ msgid "The 100%% open source Mageia distribution"
+#~ msgstr "Mageia - y dosbarthiad cod agored 100%%"
+
+#~ msgid "Explore Linux easily with Mageia One"
+#~ msgstr "Arbrofi rhwydd gyda Mageia One"
+
+#~ msgid "A full Mageia desktop, with support"
+#~ msgstr "Bwrdd gwaith Mageia llawn, gyda chefnogaeth"
+
+#~ msgid "Mageia: distributions for everybody's needs"
+#~ msgstr "Mageia: dosbarthiad ar gyfer angen pawb"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1641,7 +1882,7 @@ msgstr "Gorffen"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/da.po b/perl-install/install/share/po/da.po
index a7df36455..b5aaca44c 100644
--- a/perl-install/install/share/po/da.po
+++ b/perl-install/install/share/po/da.po
@@ -1,57 +1,82 @@
-# translation of da.po to
-# translation of da.po to Danish
-# Copyright (C) 2000,2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-# Troels Liebe Bentsen <tlb@iname.com> 2000.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Keld Simonsen <keld@dkuug.dk>, 2000-2003, 2004, 2005, 2007, 2008, 2009.
-# Keld Simonsen <keld@rap.dk>, 2005, 2006, 2010.
+# Translators:
+# Keld Simonsen <keld@dkuug.dk>, 2000-2003, 2004-2005,2007-2009
+# Keld Simonsen <keld@rap.dk>, 2005-2006,2010
 msgid ""
 msgstr ""
-"Project-Id-Version: da\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2010-07-06 21:38+0200\n"
-"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
-"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-26 19:12+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Danish (http://www.transifex.com/MageiaLinux/mageia/language/"
+"da/)\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Dit skrivebord på en USB-nøgle"
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, c-format
+msgid "Office tools"
+msgstr ""
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Linux distributionen Mageia med 100%% frit programmel"
+msgid "For kids"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Udforsk Linux nemt med Mageia One"
+msgid "For family!"
+msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Et fuldt Mageia Linux-skrivebord, med vedligeholdelse"
+msgid "For developers!"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: distributioner for ethvert behov"
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Har du andre supplerende medier?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -64,92 +89,88 @@ msgstr ""
 "\n"
 "Har du et supplerende installationsmedium, der skal konfigureres?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "Cd-rom"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Netværk (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Netværk (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Netværk (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL på spejlet?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL skal starte med ftp:// eller http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Kontakter Mageia Linux' netsted for at hente listen over tilgængelige spejle"
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Kontakter %s' netsted for at hente listen over tilgængelige spejle"
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Kunne ikke kontakte Mageia Linux' netsted for at hente listen over "
-"tilgængelige spejle"
+"Kunne ikke kontakte %s' netsted for at hente listen over tilgængelige spejle"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Vælg det spejl hvorfra pakkerne skal hentes"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-opsætning"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Indtast værtsnavn og katalog for dit NFS-medie"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Værtsmaskinenavn mangler"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Katalog skal begynde med \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Værtsnavn på NFS-monteringen?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Katalog"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Supplerende"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -158,23 +179,90 @@ msgstr ""
 "Kan ikke finde en pakkelistefil på dette spejl. Kontrollér at placeringen er "
 "korrekt."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Leder efter pakker der allerede er installeret..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Leder efter pakker som skal opgraderes..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjerner pakker før opgradering..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -187,87 +275,87 @@ msgstr ""
 "\n"
 "Ønsker du virkelig at fjerne disse pakker?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fejl ved læsning af filen %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "De følgende diske blev omdøbt:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (tidligere kaldet %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Netværk"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Vælg et medie"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fil eksisterer allerede. Skal den overskrives?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Adgang nægtet"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "DÃ¥rligt NFS-navn"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "DÃ¥rligt medie %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Kan ikke lave øjebliksbilleder før partitionering"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Øjebliksbilleder vil være tilgængelige efter installation i %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Installation"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Du skal også formatere %s"
@@ -292,22 +380,22 @@ msgstr "Bringer netværket op"
 msgid "Bringing down the network"
 msgstr "Lukker netværket ned"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Vent venligst, henter fil"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "kan ikke tilføje medie"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopierer nogle pakker til disk til fremtidig brug"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiering udføres"
@@ -337,7 +425,22 @@ msgstr "rart"
 msgid "maybe"
 msgstr "måske"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr "Ingen xml info for medie \"%s\", kun delvist resultat for pakke %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Ingen beskrivelse"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -346,66 +449,76 @@ msgstr ""
 "Visse pakker forespurgt af %s kan ikke installeres:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Der opstod en fejl:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "En fatal fejl skete: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Spørg ikke igen"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installationstransaktioner mislykkedes"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installation af pakker mislykkedes:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Arbejdsmaskine"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontor-arbejdsmaskine"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Kontor-programmer: Tekstbehandling (OpenOffice.org tekstbehandler, Kword), "
-"regneark (OpenOffice.org Regneark, Kspread ), PDF-visere, o.lign."
+"Kontor-programmer: Tekstbehandling (LibreOffice tekstbehandler, Kword), "
+"regneark (LibreOffice Regneark, Kspread ), PDF-visere, o.lign."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Spillemaskine"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Underholdnings-programmer: arkade, bræt, strategi, osv."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediecenter"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programmer til afspilning og redigering af lyd og video"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet-computer"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -414,193 +527,193 @@ msgstr ""
 "Værktøjssæt til at læse samt sende post og nyheder (mutt, tin..), og til at "
 "browse på nettet"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Netværksmaskine (klient)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienter for forskellige protokoller inklusive ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Værktøjer til at lette indstillingen af din maskine"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsolværktøjer"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redigeringsværktøjer, skaller, filværktøjer, terminaler"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Udvikling"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Biblioteker, programmer og include-filer til udvikling i C og C++"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Bøger og vejledninger om Linux og Frit Programmel"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Understøttelse for tredjeparts-programmer"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Webserver"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Samarbejdsprogrammel (Groupware)"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Brandmur/ruter"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet-adgangspunkt"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Post og nyheder"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix-postserver, Inn-nyhedsserver"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Katalogserver"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-server"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Server for domænenavne (DNS) og netværksinformation (NIS)"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fil- og Printerdelings-server"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL- og MySQL-databaseserver"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL- og MariaDB-databaseserver"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache og Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Post"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix-postserver"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL- eller MySQL-databaseserver"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL- eller MariaDB-databaseserver"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Netværksmaskine-server"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbejdsmaskine"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -609,78 +722,133 @@ msgstr ""
 "K Desktop -miljøet, det grundlæggende grafiske miljø, med en vifte af "
 "supplerende værktøjer."
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome-arbejdsmaskine"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Et grafisk miljø med brugervenlig samling af programmer og værktøjer"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-skrivebord"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Et let og hurtigt grafisk miljø med brugervenlig samling af programmer og "
-"skrivebordsværktøjer"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andre grafiske miljøer"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, osv."
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Nytteprogrammer"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-server"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin ekstern konfigurationsserver"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Nytteprogrammer og overvågning af netværk"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Overvågningsværktøjer, proceskontering, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Konfigurationsprogrammer for Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Hjæpeprogrammer til at konfigurere server"
@@ -695,7 +863,7 @@ msgstr ""
 "pæn måde.\n"
 "Fortsæt på eget ansvar!"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -715,255 +883,254 @@ msgstr "GÃ¥r til trin `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux Installation %s"
+msgid "%s Installation %s"
+msgstr "%s Installation %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> mellem elementer"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg-server er langsom at starte. Vent venligst..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Dit system har kun få resurser. Du kan få problemer med at installere\n"
-"Mageia Linux. Hvis dette sker, kan du prøve en tekst-baseret installation i "
-"stedet.\n"
+"%s. Hvis dette sker, kan du prøve en tekst-baseret installation i stedet.\n"
 "Dette gøres ved at trykke 'F1' ved opstart fra cdrommen, og så skrive 'text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Installér Mageias KDE-skrivebord"
+msgid "Media Selection"
+msgstr "Valg af pakkemedie"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Installér Mageias GNOME-skrivebord"
+msgid "Install %s KDE Desktop"
+msgstr "Installér %ss KDE-skrivebord"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Installér %ss GNOME-skrivebord"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Tilpasset installation"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE-skrivebord"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME-skrivebord"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Tilpasset skrivebord"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Her er et smugkig på '%s'-skrivebordet."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klik på billeder for at se et større smugkig"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Valg af pakkegrupper"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuelt pakkevalg"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Total størrelse: %d / %d MB"
+msgid "Unselect All"
+msgstr "Fravalgte alt"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "DÃ¥rlig pakke"
+msgid "Total size: %d / %d MB"
+msgstr "Total størrelse: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Version: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Størrelse: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Vigtighed: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Du kan ikke vælge/fravælge denne pakke"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "grundet manglende %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "grundet uopfyldt %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "prøver at forfremme %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "for at beholde %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Du kan ikke vælge denne pakke, da der ikke er nok plads tilbage til at "
 "installere den"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "De følgende pakker vil blive installeret"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "De følgende pakker vil blive afinstalleret"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Dette er en nødvendig pakke, den kan ikke vælges fra"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Du kan ikke fravælge denne pakke. Den er allerede installeret"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Du kan ikke fravælge denne pakke. Den skal opgraderes"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Vis automatisk valgte pakker"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Installér"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Indlæs eller gem det markerede"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Opdaterer pakkevalg"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal installation"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr ""
 "Administration\n"
 "af programmer"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Vælg pakker som skal installeres"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installerer"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Ingen detaljer"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Resterende tid:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(beregner...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakke"
 msgstr[1] "%d pakker"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Oversigt"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Konfigurér"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "ikke konfigureret"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Valg af pakkemedie"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -972,12 +1139,12 @@ msgstr ""
 "De følgende installationsmedier er fundet.\n"
 "Hvis du ønsker at springe nogen af dem over, kan du fravælge dem nu."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Du har mulighed for at kopiere indholdet af cd'erne over på disken før "
@@ -985,72 +1152,72 @@ msgstr ""
 "Installationen vil så fortsætte fra disken og pakkerne vil forblive "
 "tilgængelige, når systemet er fuldt installeret."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiér hele cd'er"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Der opstod en fejl"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Vælg dit tastaturlayout"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Her er den komplette liste over tilgængelige tastaturer:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installér/Opgradér"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Er dette en nyinstallation eller en opgradering?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installation"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Opgradér %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Krypteringsnøgle for %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Afbryd installation, genstart system"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Ny installation"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Opgradér tidligere installation (ikke anbefalet)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1058,46 +1225,18 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Installationsprogrammet har opdaget at dit installerede Mageia Linux-system "
-"ikke kunne \n"
-"opgraderes sikkert til %s.\n"
-"\n"
-"En ny installation som erstatter dit tidligere system anbefales.\n"
-"\n"
-"Advarsel: Du bør tage en sikkerhedskopi af alle dine personlige data før du "
-"vælger \"Ny\n"
-"Installation\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Konfigurerer IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Det er ikke plads til 1 MB bootstrap! Installationen vil fortsætte, men for "
-"at starte dit system op, skal du lave bootstrap-partitionen i DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Du skal lave en PPC PReP Boot-bootstrap! Installationen vil fortsætte, men "
-"for at starte dit system op, skal du lave bootstrap-partitionen i DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1111,12 +1250,12 @@ msgstr ""
 "Hvis du ikke har den, så tryk på Annullér for at undgå installation fra "
 "denne cd."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Leder efter tilgængelige pakker..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1125,7 +1264,7 @@ msgstr ""
 "Dit system har ikke nok plads tilbage til installation eller opgradering "
 "(%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1134,52 +1273,52 @@ msgstr ""
 "Vælg indlæsning eller gemning af pakkevalg.\n"
 "Formatet er det samme som for auto_install-genererede filer."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Indlæs"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Gem"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "DÃ¥rlig fil"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Valg af skrivebord"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Du kan vælge profil for din arbejdsmaskines skrivebord."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valgt størrelse er større end tilgængelig plads"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Installationstype"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1188,88 +1327,112 @@ msgstr ""
 "Du har ikke valgt nogen gruppe af pakker.\n"
 "Vælg den minimale installation du ønsker:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Installér foreslåede pakker"
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med basal dokumentation (anbefalet!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Virkelig minimal installation (specielt ingen urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Forbereder installationen"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Der opstod en fejl ved sorteringen af pakkerne:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Fortsæt alligevel?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Prøv igen"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Overspring denne pakke"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Overspring alle pakker fra medie '%s'"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "GÃ¥ tilbage til valg af medie og pakker"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Der opstod en fejl ved installeringen af pakke %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Konfiguration efter installation"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Forsikr dig venligst om at mediet med opdateringsmodulerne er i drev %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Opdateringer"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1290,28 +1453,29 @@ msgstr ""
 "\n"
 "Ønsker du at installere opdateringerne?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Udstyr"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du et ISA-lydkort?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1320,81 +1484,69 @@ msgstr ""
 "Kør \"alsaconf\" eller \"sndconfig\" efter installation for at konfigurere "
 "dit lydkort"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Intet lydkort genkendt. Prøv at køre  \"harddrake\" efter installation"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grænseflade"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Netværk og Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxyer "
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "konfigureret"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Sikkerhedsniveau"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Brandmur"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktiveret"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "deaktiveret"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Du har ikke konfigureret X. Er du sikker på at du virkelig ønsker dette?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Forbereder opstartsindlæser..."
+msgid "Preparing initial startup program..."
+msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Vær tålmodig, dette kan tage et stykke tid..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Det virker som om du har en OldWorld eller ukendt maskine - yaboot "
-"opstartsindlæseren vil ikke virke for dig. Installationen vil fortsætte, men "
-"du skal bruge BootX eller en anden måde til at starte din maskine. Kernens "
-"parameter for root-filsystemet er: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1403,17 +1555,17 @@ msgstr ""
 "I dette er sikkerhedsniveau er adgang til Windows-partitionen forbeholdt "
 "administratoren."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Indsæt en tom diskette i drev %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Laver autoinstallations-diskette..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1424,12 +1576,12 @@ msgstr ""
 "\n"
 "Er du sikker på du ønsker du at lukke nu?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Tillykke"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Genstart"
@@ -1524,13 +1676,6 @@ msgid ""
 "Users"
 msgstr "Brugere"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Netværk"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
diff --git a/perl-install/install/share/po/de.po b/perl-install/install/share/po/de.po
index 6b527faab..e60f20e6f 100644
--- a/perl-install/install/share/po/de.po
+++ b/perl-install/install/share/po/de.po
@@ -1,67 +1,88 @@
-# translation of de.po to deutsch
-# german translation of the MandrivaInstaller.
-# Copyright (C) 2000-2003 Mandriva S.A.
-# Stefan Siegel <siegel@linux-mandrake.com>, 2000, 2001, 2002, 2003.
-# Sebastian Deutscher <sebastian_deutscher@web.de>, 2003,2004.
-# Gerhard Ortner <gerhard.ortner@aon.at>, 2003, 2004.
-# Roy Steuber <roysteuber@mittweida-net.de>, 2004.
-# Marcus Fischer <i18n@marcusfischer.com>, 2004.
-# Frank Köster <frank@dueppel13.de>, 2004, 2005.
-# Ronny Standtke <Ronny.Standtke@gmx.de>, 2003, 2004.
-# Ronny Standtke <Ronny.Standtke@gmx.net>, 2004, 2005.
-# Nicolas Bauer <webmaster@mandrakeusers.de>, 2005.
-# Frank Koester <frank@dueppel13.de>, 2005.
-# Nicolas Bauer <rastafarii@mandrivauer.de>, 2006, 2007.
-# Nicolas Bauer <rastafarii@mandrivauser.de>, 2007.
-# Oliver Burger <oliver@mandrivauser.de>, 2008, 2009, 2010.
-# Oliver Burger <oliver.burger@wizard-fire.de>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
+# psyca, 2014-2015
+# Marc Lattemann, 2013
+# Marc Lattemann, 2013
+# Oliver Burger <obgr_seneca@mageia.org>, 2013
+# psyca, 2014
+# user7 <wassipaul@gmx.at>, 2013
+# user7 <wassipaul@gmx.at>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: de\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2010-04-11 18:12+0200\n"
-"Last-Translator: Oliver Burger <oliver@mandrivauser.de>\n"
-"Language-Team: German <cooker-i18n@mandrivalinux.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-30 13:10+0000\n"
+"Last-Translator: psyca\n"
+"Language-Team: German (http://www.transifex.com/projects/p/mageia/language/"
+"de/)\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Ihr Desktop auf einem USB-Speicher"
+msgid "Join Us!"
+msgstr "Treten sie bei!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Die 100%% Open Source Mageialinux-Distribution"
+msgid "Make it yours!"
+msgstr "Passen Sie es Ihren Wünschen an!"
 
-#: ../../advertising/IM_one.pl:1
-#, fuzzy, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Der leichte Weg, Linux kennen zu lernen mit der Mageia One"
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr "Sie haben die Wahl!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Ein vollständiger Mageia Linux Desktop inklusive Support"
+msgid "Office tools"
+msgstr "Arbeitsplatz werkzeuge"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr ""
+msgid "Home entertainment"
+msgstr "Home Entertainment"
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Für Kinder"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Für die Familie!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Für Entwickler"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Danke!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Sei Frei!"
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Haben Sie zusätzliche Medien?"
+msgstr "Haben Sie weitere zusätzliche Medien?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -73,119 +94,195 @@ msgstr ""
 "verwendet: %s\n"
 "\n"
 "\n"
-"Haben Sie noch weitere Installationsmedienzum konfigurieren?"
+"Haben Sie noch weitere Installationsmedien zu konfigurieren?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Netzwerk (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Netzwerk (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Netzwerk (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
-msgstr "URL der Spiegel?"
+msgstr "URL des Spiegel-Servers?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Die URL muss mit ftp:// oder http:// beginnen"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Kontaktiere Mageia Linux Web-Server, um eine Liste verfügbarer Pakete zu "
-"erhalten..."
+"Die %s-Webseite wird kontaktiert, um eine Liste der verfügbaren Spiegel-"
+"Server zu erhalten..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Kontaktieren Sie die Mageia Linux Webseiten, um eine Liste verfügbaren "
-"Mirrors zu erhalten"
+"Die %s-Webseite kann nicht erreicht werden, um die Liste der verfügbaren "
+"Spiegel-Server zu erhalten"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Bitte wählen Sie einen Mirror, von dem Sie die Pakete holen wollen."
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
-msgstr "NFS-Einrichtungsetup"
+msgstr "NFS-Einrichtung"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 "Bitte geben Sie den Rechnernamen und das Verzeichnis ihres NFS-Mediums ein"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Hostname fehlt"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Verzeichnis muss mit \"/\" beginnen"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Rechnername der NFS-Einbindung?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Ergänzend"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
-msgstr "Kann die Datei hdlist nicht auf diesem Spiegel finden"
+msgstr "Kann keine Paketliste auf diesem Spiegel-Server finden."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core-Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted-Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree-Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Ihre Maschine beinhaltet Hardware, die nicht-freie Firmware-Dateien "
+"benötigt, damit die freien Treiber funktionieren."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Sie sollten „%s“ aktivieren"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+"„%s“ enthält die verschiedenen Bestandteile des Systems und seiner "
+"Anwendungen"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "„%s“ enthält nicht-freie Software.\n"
+
+#: any.pm:477
+#, 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 ""
+"Es enthält auch Firmware-Dateien, die für einige Geräte benötigt werden, um "
+"funktionieren zu können (z.B. einige AMD/ATI-Grafikkarten, einige "
+"Netzwerkkarten, einige RAID-Karten,...)."
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"„%s“ enthält Software, die aufgrund von Software-Patenten nicht in jedem "
+"Land verbreitet werden darf."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"Es enthält auch Software aus „%s“, die mit zusätzlichen Fähigkeiten neu "
+"gebaut wurde."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Sie können hier weitere Medien aktivieren, wenn Sie das wünschen."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Dieses Medium enthält Paket-Aktualisierungen für das Medium „%s“"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
-msgstr "Suche nach bereits installierten Paketen ..."
+msgstr "Bereits installierte Pakete werden gesucht ..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
-msgstr "Finde die zu aktualisierenden Pakete ..."
+msgstr "Zu aktualisierende Pakete werden gesucht..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
-msgstr "Entferne Pakete vor der Aktualisierung..."
+msgstr "Pakete vor der Aktualisierung entfernen..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -199,87 +296,87 @@ msgstr ""
 "\n"
 "Wollen Sie diese Pakete wirklich entfernen?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fehler beim Lesen der Datei %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Die folgenden Datenträger wurden umbenannt:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (vorher als %s bezeichnet)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Netzwerk"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Bitte wählen Sie ein Medium"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Die Datei existiert bereits. Ãœberschreiben?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
-msgstr "Falscher NFS-Name"
+msgstr "Fehlerhafter NFS-Name"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
-msgstr "Mediumfehler %s"
+msgstr "Fehlerhaftes Medium %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
-msgstr "Vor der Partitionierung kann ich keine Screenshots machen."
+msgstr "Vor der Partitionierung können keine Screenshots erstellt werden"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "Die Screenshots liegen nach der Installation unter „%s“"
+msgstr "Die Screenshots finden sich nach der Installation unter „%s“"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Installation"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Sie müssen auch %s formatieren."
@@ -303,22 +400,22 @@ msgstr "Netzwerkverbindung herstellen"
 msgid "Bringing down the network"
 msgstr "Netzwerkverbindung trennen"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Bitte warten, Datei wird empfangen"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "Es ist nicht möglich, das Medium hinzuzufügen"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Pakete auf die Festplatte speichern für die spätere Verwendung"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Dateien werden kopiert"
@@ -348,75 +445,102 @@ msgstr "angenehm"
 msgid "maybe"
 msgstr "eventuell"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Paket-Informationen aus den XML-Metadaten beziehen..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Keine XML-Informationen für das Medium „%s“ vorhanden, es können nur "
+"Teilergebnisse für das Paket %s angegeben werden"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Keine Beschreibung"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
-"Einige der Ausgewählten Programme von %s können nicht installiert werden:\n"
+"Einige der ausgewählten Programme von %s können nicht installiert werden:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Ein Fehler ist aufgetreten:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Fataler Fehler aufgetreten: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Nicht erneut fragen"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
-msgstr "%d Installation schlug fehl"
+msgstr "%d Installationstransaktionen schlugen fehl"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installieren der Pakete ist fehlgeschlagen:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Arbeitsplatzrechner"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Büro-Arbeitsplatz"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Office-Programme: Textverarbeitung (Openoffice.org Writer, KWord), "
-"Tabellenkalkulation (OpenOffice.org Calc, KSpread), PDF-Betrachter, usw."
+"Office-Programme: Textverarbeitung (LibreOffice Writer, KWord), "
+"Tabellenkalkulation (LibreOffice Calc, KSpread), PDF-Betrachter, usw."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Spiele-Station"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Spiele: Arcade-, Brett-, Strategiespiele, usw."
+msgstr "Spiele: Arkade-, Brett-, Strategiespiele, usw."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedia-Station"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
-msgstr "Programme, um Sound und Video abzuspielen und zu bearbeiten"
+msgstr "Programme, um Audio und Video abzuspielen und zu bearbeiten"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet-Station"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -425,193 +549,193 @@ msgstr ""
 "Programme um E-Mails und News zu lesen und zu versenden (pine, mutt, tin..) "
 "und um im Internet zu surfen"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Netzwerk-Computer (Client)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients für verschiedene Protokolle, u.a. SSH"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Werkzeuge, die die Konfiguration Ihres Computers erleichtern"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsolen-Werkzeuge"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editoren, Shells, Dateiwerkzeuge, Konsolen"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Entwicklung"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
-msgstr "C und C++ Entwicklungsbibliotheken, Programme und Include-Dateien"
+msgstr "C- und C++-Entwicklungsbibliotheken, Programme und Include-Dateien"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Bücher und HOWTOs zu GNU/Linux und Freier Software"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux-Standard-Base. Drittanbieterunterstützung"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Webserver"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
-msgstr "Firewall / Router"
+msgstr "Firewall/Router"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet-Gateway"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "E-Mail/News"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Postfix Mail-Server, Inn News-Server"
+msgstr "Postfix-Mail-Server, Inn-News-Server"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Verzeichnisdienst"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-Server"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domänennamen- und Netzwerk-Informations-Server"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Datei- und Druckerserver"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
-msgstr "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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Datenbank"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL und MySQL-Datenbankserver"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL- und MariaDB-Datenbankserver"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
-msgstr "Email"
+msgstr "E-Mail"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
-msgstr "Postfix Mail-Server"
+msgstr "Postfix-Mail-Server"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL oder MySQL-Datenbankserver"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL- oder MariaDB-Datenbankserver"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Netzwerkrechner-Server"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafische Arbeitsoberfläche"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-Arbeitsplatz"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -620,79 +744,142 @@ msgstr ""
 "Die K-Desktop-Umgebung, die Standard-Arbeitsfläche mit einer Sammlung "
 "zugehöriger Programme"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome-Arbeitsplatz"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
-"Eine grafische Umgebung mit anwenderfreundlichen Anwendungen und Werkzeugen"
+"Eine grafische Arbeitsoberfläche mit anwenderfreundlichen Anwendungen und "
+"Werkzeugen"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "XFCE-Arbeitsplatz"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Eine schlankere grafische Arbeitsoberfläche mit anwenderfreundlichen "
+"Anwendungen und Werkzeugen"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "MATE-Arbeitsplatz"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Cinnamon-Arbeitsplatz"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Eine auf GNOME basierende graphische Arbeitsoberfläche"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "LXQT-Desktop"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+"Qt-Portierung der leichtgewichtigen Desktop-Umgebung der nächsten Generation"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Enlightenment e17-Desktop"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Eine schlanke und schnelle grafische Arbeitsoberfläche mit "
+"anwenderfreundlichen Anwendungen und Werkzeugen"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-Desktop"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Eine leichtgewichtige und schnelle grafische Umgebung"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasma-Desktop"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Eine leichtgewichtige und schnelle grafische Umgebung mit "
-"anwenderfreundlichen Anwendungen und Werkzeugen"
+"Der Plasma-Desktop, die Standard-Arbeitsfläche mit einer Sammlung "
+"zugehöriger Programme"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andere grafische Arbeitsflächen"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, usw."
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, usw."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Werkzeuge"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-Server"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Webmin Fernkonfigurationsserver"
+msgstr "Webmin-Fernkonfigurationsserver"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Netzwerkwerkzeuge/-überwachung"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Ãœberwachungswerkzeuge, Prozessverwaltung, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia-Assistenten"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Assistenten zur Servereinrichtung"
@@ -703,10 +890,10 @@ msgid ""
 "An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"Es trat ein Fehler auf. Ich weiß jedoch nicht, wie ich damit sinnvoll \n"
-"umgehen soll. Sie können fortfahren, jedoch auf eigenes Risiko!"
+"Es trat ein Fehler auf. Ich weiß jedoch nicht, wie ich damit umgehen soll. "
+"Sie können fortfahren, jedoch auf eigenes Risiko!"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -726,258 +913,258 @@ msgstr "Beginn von Schritt „%s“\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux-Installation %s"
+msgid "%s Installation %s"
+msgstr "%s Installation %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> zwischen den Elementen"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
-msgstr "Xorg Server braucht lange zum Starten. Bitte warten Sie..."
+msgstr "Der Xorg-Server braucht lange zum Starten. Bitte warten Sie..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Ihr Rechner hat nicht genug Ressourcen. Vermutlich werden bei der \n"
-"Installation Probleme auftreten. In diesem Fall sollten Sie eine \n"
-"Text-Installation versuchen. Drücken Sie dafür <F1> während dem \n"
-"Installationsstart und geben Sie „text“ an der Eingabeaufforderung \n"
-"ein."
+"Ihr System hat nur geringe Resourcen. Sie werden eventuell Probleme haben, "
+"%s zu installieren.\n"
+"Wenn dies auftritt, können Sie eine Textinstallation versuchen, dafür\n"
+"drücken Sie „F1“, wenn Sie von der CD-Rom installieren, dann geben Sie "
+"„text“ ein."
+
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr "Auswahl der Installationsmedien"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Installation des Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
+msgstr "Den %s-KDE-Desktop installieren"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Installation des Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
+msgstr "Den %s-GNOME-Desktop installieren"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
-msgstr "Benutzer Installation"
+msgstr "Benutzerdefinierte Installation"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE-Desktop"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME-Desktop"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Benutzerdefinierter Desktop"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
-msgstr "Hier sehen Sie eine Vorschau des '%s' Desktops"
+msgstr "Hier sehen Sie eine Vorschau des „%s“-Desktops"
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klicken Sie auf die Bilder, um größere Vorschauen zu erhalten"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Auswahl der Paketgruppen"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuelle Paketauswahl"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Gesamtgröße: %d / %d MB"
+msgid "Unselect All"
+msgstr "Auswahl aufheben"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Ungültiges Paket"
+msgid "Total size: %d / %d MB"
+msgstr "Gesamtgröße: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Version: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Größe: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
-msgstr "%d KB\n"
+msgstr "%d kB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Wichtigkeit: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Sie können dieses Paket nicht auswählen/abwählen."
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
-msgstr "%s fehlt"
+msgstr "da %s fehlt"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
-msgstr "Aufgrund unerfüllter %s"
+msgstr "da %s unerfüllt ist"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "Versuche %s voranzutreiben"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "um %s beizubehalten"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Sie können dieses Paket nicht auswählen, da Sie nicht genug Plattenplatz "
 "haben."
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Die folgenden Pakete werden installiert"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Die folgenden Pakete werden entfernt"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Dieses Paket ist existenziell, sie können es nicht abwählen!"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr ""
 "Sie können dieses Paket nicht aus der Auswahl entfernen. \n"
 "Es ist bereits installiert!"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr ""
 "Sie können dieses Paket nicht aus der Auswahl entfernen. \n"
 "Es muss aktualisiert werden!"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Automatisch markierte Pakete anzeigen"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Installation"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Auswahl laden/speichern"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Erneuere Paket Auswahl"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal-Installation"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Software verwalten"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Zu installierende Pakete auswählen"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installation"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Keine Details"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Verbleibende Zeit "
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(Schätzen...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d Paket"
 msgstr[1] "%d Pakete"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "Nicht eingerichtet"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Auswahl der Installationsmedien"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -986,12 +1173,12 @@ msgstr ""
 "Die folgenden Installationsmedien wurden gefunden.\n"
 "Wählen Sie die Medien ab, die Sie überspringen wollen."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Sie haben die Möglichkeit, den Inhalt der CDs vor der Installation auf "
@@ -999,72 +1186,72 @@ msgstr ""
 "fortgeführt und die Softwarepakete bleiben verfügbar, nachdem das System "
 "fertig installiert ist."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiere die CDs"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Ein Fehler ist aufgetreten"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
-msgstr "Bitte wählen Sie Ihren Tastaturtyp"
+msgstr "Bitte wählen Sie Ihr Tastaturlayout"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Komplette Liste aller verfügbarer Tastaturlayouts"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installation/Aktualisierung"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Handelt es sich um eine Installation oder eine Aktualisierung?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installation"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Aktualisiere %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Schlüssel für %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Installation abbrechen, das System neustarten"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Neuinstallation"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
-msgstr "Vorhergehende Installation aktualisieren (nicht empfohlen)"
+msgstr "Bestehende Installation aktualisieren (nicht empfohlen)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1072,7 +1259,7 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Der Installer hat festgestellt, dass Ihr Mageia Linux System nicht\n"
+"Der Installer hat festgestellt, dass Ihr Linux System nicht\n"
 "sicher zu %s aktualisiert werden kann.\n"
 "\n"
 "Eine Neuinstallation, die Ihre bisherige ersetzt, wird empfohlen.\n"
@@ -1080,37 +1267,17 @@ msgstr ""
 "Warnung: Sie sollten all Ihre persönlichen Daten sichern, bevor Sie \"Neu\n"
 " Installation\" wählen."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE konfigurieren"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Sie haben keinen Platz für die 1 MB große Start-Partition vorgesehen! Die "
-"Installation wird fortgesetzt, Sie müssen jedoch eine Start-Partition mit "
-"DiskDrake erstellen."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Sie müssen einen PPC PReP Boot Lader erzeugen! Die Installation wird "
-"fortgesetzt, Sie müssen jedoch eine Start-Partition mit DiskDrake erstellen."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1122,12 +1289,12 @@ msgstr ""
 "Bitte legen Sie die CD-ROM „%s“ in Ihr Laufwerk. Drücken Sie dann auf „OK“.\n"
 "Falls Sie sie nicht vorliegen haben, drücken Sie auf „Abbrechen“."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Suche nach vorhandenen Paketen..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1136,7 +1303,7 @@ msgstr ""
 "Das System hat für die Installation oder das Update nicht genug freien "
 "Speicher (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1146,52 +1313,52 @@ msgstr ""
 "gespeichert werden soll. Es handelt sich um das gleiche\n"
 "Format, wie die unter „auto_install“ erzeugten Disketten."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
-msgstr "Last"
+msgstr "Laden"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Speichern"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Datei fehlerhaft"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Auswahl der Desktopumgebung"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Sie haben die Wahl zwischen verschiedenen Desktopprofilen."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Gewünschte Größe übersteigt den verfügbaren Platz"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Installationstyp"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1200,89 +1367,117 @@ msgstr ""
 "Sie haben keine Paketgruppe ausgewählt.\n"
 "Bitte wählen Sie die minimale Installation, die Sie wünschen."
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
-msgstr "Mit X"
+msgstr "Mit X (grafischem Server)"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Installiere Paket %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr "Empfohlene Pakete installieren"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Mit minimaler Dokumentation (Empfohlen)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Extrem minimale Installation (ohne „urpmi“)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Die Aktualisierung wird vorbereitet"
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
-msgstr "Bereite Installation vor"
+msgstr "Installation wird vorbereitet"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
-msgstr "Installiere Paket %s"
+msgstr "Paket %s wird installiert"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Bei der Anforderung folgender Pakete trat ein Fehler auf:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Wollen Sie trotzdem fortfahren?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Dieses Paket überspringen"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
-msgstr "Ãœberspringe alle Pakete von dem Medium \"%s\""
+msgstr "Alle Pakete vom Medium \"%s\" werden übersprungen"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Zurück zu den Medien und zur Paketauswahl"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
-msgstr "Bei der Installation des Paketes%s trat ein Fehler auf."
+msgstr "Bei der Installation des Paketes %s trat ein Fehler auf."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Bereite weitere Konfiguration vor ..."
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Bitte stellen Sie sicher, dass sich das Update-Modul-Medium im Laufwerk %s "
 "befindet"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Aktualisierungen"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Sie haben nun die Möglichkeit, Onlinemedien einzurichten."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Dies erlaubt Ihnen Sicherheitsaktualisierungen zu installieren."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Um diese Medien einzurichten benötigen Sie eine funktionierende\n"
+"Internetverbindung.\n"
+"\n"
+"Möchen Sie die Onlinemedien einrichten?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1295,35 +1490,36 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Sie haben nun die Möglichkeit Pakete zu installieren, die seit Erscheinen\n"
-"der Distribution aktualisiert wurden. Es handelt sich um \n"
-"Sicherheitsaktualisierungen und Fehlerkorrekturen.\n"
+"der Distribution aktualisiert wurden. Diese können "
+"Sicherheitsaktualisierungen und Fehlerkorrekturen beinhalten.\n"
 "\n"
 "Allerdings benötigen Sie dafür eine funktionierende Internetverbindung.\n"
 "\n"
 "Möchten Sie die Aktualisierungen vornehmen?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s auf %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Soundkarte"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Verfügen Sie über eine ISA-Soundkarte?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1332,102 +1528,89 @@ msgstr ""
 "Starten Sie „sndconfig“ oder „alsaconf“ nach der Installation, um Ihre "
 "Soundkarte einzurichten."
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Es wurde keine Soundkarte gefunden. Versuchen Sie „harddrake“ nach der "
 "Installation."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafikumgebung"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Netzwerk & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxies"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "konfiguriert"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Sicherheitsebene"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktiviert"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Sie haben X nicht konfiguriert. Sind Sie sicher?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Bereite Bootloader vor ..."
+msgid "Preparing initial startup program..."
+msgstr "Initiale Systemstartprogramme vorbereiten..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
-msgstr "Ein wenig Geduld, dies kann eine Zeit lang brauchen..."
-
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Sie scheinen einen „OldWorld“ oder unbekannten Rechner zu verwenden. Der "
-"Bootloader „yaboot“ wird daher leider nicht funktionieren. Die Installation "
-"wird fortgesetzt, sie werden jedoch „BootX“ oder etwas ähnliches verwenden "
-"müssen um Ihren Rechner zu starten. Der Kernelparameter für das Root-"
-"Dateisystem ist: root=%s"
+msgstr "Ein wenig Geduld, dies kann einige Zeit dauern..."
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
-"In dieser Sicherheitseinstellung ist der Zugriff auf Datein der "
+"In dieser Sicherheitseinstellung ist der Zugriff auf Dateien der "
 "Windowspartition nur dem Administrator erlaubt"
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
-msgstr "Legen Sie eine leere Diskette in das %s ein."
+msgstr "Legen Sie eine leere Diskette in das Laufwerk %s ein."
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Erstelle eine Auto-Installationsdiskette"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1438,12 +1621,12 @@ msgstr ""
 "\n"
 "Wollen Sie DrakX wirklich beenden?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Herzlichen Glückwunsch!"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Neustart"
@@ -1459,7 +1642,7 @@ msgstr "Sprache auswählen"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr "Lokalisation"
+msgstr "Lokalisierung"
 
 #: steps_list.pm:17
 #, c-format
@@ -1515,7 +1698,7 @@ msgstr "Partitionierung"
 msgid ""
 "_: Keep these entry short\n"
 "Formatting"
-msgstr "Formatieren"
+msgstr "Formatierung"
 
 #: steps_list.pm:29
 #, c-format
@@ -1538,13 +1721,6 @@ msgid ""
 "Users"
 msgstr "Benutzer"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Netzwerk"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1586,36 +1762,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Verlassen"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Office-Programme: Textverarbeitung (KWord, Abiword), Tabellenkalkulation "
-#~ "(KSpread, Gnumeric), PDF-Betrachter, usw."
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Sie haben sich entschieden, Ihr System auf %s zu aktualisieren. Es wurde "
-#~ "ein KDE 3.5 auf Ihrem System erkannt\n"
-#~ "Dieser Installer kann KDE 3.5 in einer Aktualisierung nicht erhalten, "
-#~ "wenn Si forfahren wollen,\n"
-#~ "wird KDE 3.5. durch KDE 4 ersetzt und Sie werden Ihre persönlichen KDE "
-#~ "3.5 Einstellungen verlieren.\n"
-#~ "Um mit KDE 3.5 zu aktualisieren und Ihre persönlichen Einstellungen zu "
-#~ "erhalten, \n"
-#~ "starten Sie Ihr System neu und aktualisieren Sie mit Hilfe von "
-#~ "MandrivaUpdate."
-
-#~ msgid "Proceed"
-#~ msgstr "Fortfahren"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "Holen von [%s] fehlgeschlagen"
diff --git a/perl-install/install/share/po/el.po b/perl-install/install/share/po/el.po
index 1f88f1a77..95c916aca 100644
--- a/perl-install/install/share/po/el.po
+++ b/perl-install/install/share/po/el.po
@@ -5,57 +5,79 @@
 # Thanos Kyritsis <djart@hellug.gr>, 2001.
 # �ίκος ��κτα�ης (Nick Niktaris) <niktarin@yahoo.com>, 2003.
 # nikos papadopoulos <231036448@freemail.gr>, 2008.
-# Glentadakis Dimitrios <dglent@gmail.com>, 2009, 2010.
+# Dimitrios Glentadakis <dglent@gmail.com>, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-el\n"
+"Project-Id-Version: drakx_install\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2010-02-11 18:37+0100\n"
-"Last-Translator: Glentadakis Dimitrios\n"
-"Language-Team: Greek <translators_team@mandrivalinux.gr>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-23 08:51+0200\n"
+"Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
+"Language-Team: Greek <i18n-el@ml.mageia.org>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Greek\n"
-"X-Poedit-Country: GREECE\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Lokalize 1.5\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Το π�οσωπικό σου σ�στημα ε�γασίας σε ένα USB"
+msgid "Join Us!"
+msgstr "Ελάτε μαζί μας!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Η 100%% ανοιχτο� κώδικα, διανομή του Mageia Linux"
+msgid "Make it yours!"
+msgstr "Κάντε τη δική σας!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Εξε�ε�νησε το Λίνουξ, ε�κολα, με το Mageia One"
+msgid "Your choice!"
+msgstr "Η επιλογή σας!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Ένα πλή�ες σ�στημα desktop Mageia Linux, με υποστή�ιξη"
+msgid "Office tools"
+msgstr "Ε�γαλεία γ�αφείου"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: συστήματα Λίνουξ για όλες τις χ�ήσεις"
+msgid "Home entertainment"
+msgstr "Οικιακή ψυχαγωγία"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Για τα παιδιά"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Για την οικογένεια!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Για π�ογ�αμματιστές!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Ευχα�ιστο�με!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Ελευθε�ωθείτε!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Έχεις κάποια επιπλέον συμπλη�ωματικά μέσα;"
+msgstr "Έχετε άλλα π�όσθετα μέσα ενημέ�ωσης;"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -63,125 +85,200 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
-"Β�έθηκαν τα ακόλουθα μέσα, και θα χ�ησιμοποιηθο�ν κατά την εγκατάσταση: %s.\n"
+"Β�έθηκαν τα ακόλουθα μέσα και θα χ�ησιμοποιηθο�ν κατά την εγκατάσταση: %s.\n"
 "\n"
 "\n"
-"Έχεις κάποιο συμπλη�ωματικό μέσο εγκατάστασης για ��θμιση;"
+"Έχετε κάποιο συμπλη�ωματικό μέσο εγκατάστασης για ��θμιση;"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Δίκτυο (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Δίκτυο (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Δίκτυο (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
-msgstr "Το URL της εναλλακτικής διε�θυνσης;"
+msgstr "Το URL του καθ�επτισμο�;"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Το URL π�έπει να ξεκινά με ftp:// ή http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Σ�νδεση με την τοποθεσία της Mageia Linux, για λήψη της λίστας με τις "
-"εναλλακτικές διευθ�νσεις..."
+"Σ�νδεση με την ιστοσελίδα της %s για λήψη της λίστας με τους διαθέσιμους "
+"καθ�επτισμο�ς..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Αδυναμία σ�νδεσης με την τοποθεσία της Mageia Linux, για λήψη της λίστας με "
-"τις εναλλακτικές διευθ�νσεις"
+"Αδυναμία σ�νδεσης με την ιστοσελίδα της %s για λήψη της λίστας με τους "
+"διαθέσιμους καθ�επτισμο�ς"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
-msgstr "Επιλέξτε τόπο από τον οποίο θα γίνει η λήψη πακέτων"
+msgstr "Επιλέξτε έναν καθ�επτισμό από τον οποίο θα γίνει η λήψη των πακέτων"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Ρ�θμιση NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
-msgstr ""
-"Πα�ακαλώ, εισήγαγε το hostname (οικοδεσπότη υπολογιστή) και τη διαδ�ομή του "
-"μέσου NFS"
+msgstr "Πα�ακαλώ εισάγετε το όνομα υπολογιστή και τη διαδ�ομή του μέσου NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
-msgstr "Λείπει ο hostname (οικοδεσπότης υπολογιστής)"
+msgstr "Λείπει το όνομα υπολογιστή"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
-msgstr "Ο κατάλογος π�έπει να α�χίζει με \"/\""
+msgstr "Ο κατάλογος π�έπει να α�χίζει με «/»"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
-msgstr "Ο hostname (οικοδεσπότης υπολογιστής) της NFS π�οσά�τησης ;"
+msgstr "Το όνομα υπολογιστή της π�οσά�τησης NFS;"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Κατάλογος"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Συμπλη�ωματικά"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
-"Δεν β�έθηκε το α�χείο με την λίστα των πακέτων σε αυτόν τον mirror. "
+"Δεν β�έθηκε το α�χείο με την λίστα των πακέτων σε αυτόν τον καθ�επτισμό. "
 "Σιγου�ευτείτε ότι η τοποθεσία είναι σωστή."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Στο μηχάνημά σας υπά�χει υλικό που απαιτεί μη ελε�θε�ο firmware ώστε να "
+"λειτου�γο�ν οι οδηγοί ανοιχτο� κώδικα. "
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Θα π�έπει να ενε�γοποιήσετε το «%s»"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+"Το «%s» πε�ιέχει τα διάφο�α τμήματα του συστήματος και τις εφα�μογές του"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "Το «%s» πε�ιέχει μη ελε�θε�ο λογισμικό.\n"
+
+#: any.pm:477
+#, 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 ""
+"Επίσης, πε�ιέχει firmware που απαιτο�νται για την λειτου�γία ο�ισμένων "
+"συσκευών (πχ: με�ικές κά�τες γ�αφικών ATI/AMD, με�ικές κά�τες δικτ�ου, "
+"με�ικές κά�τες RAID, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"Το «%s» πε�ιέχει λογισμικό που δεν μπο�εί να διανεμηθεί σε όλες τις χώ�ες "
+"λόγω πε�ιο�ισμο� των διπλωμάτων ευ�εσιτεχνίας."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"Επίσης, πε�ιέχει λογισμικό από το «%s» επαναδημιου�γημένο με επιπλέον "
+"χα�ακτη�ιστικά."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+"Αν το επιθυμείτε, εδώ μπο�είτε να ενε�γοποιήσετε πε�ισσότε�ες πηγές "
+"λογισμικο�."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Αυτό το μέσο πα�έχει ενημε�ώσεις πακέτων για το μέσο «%s»"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
-msgstr "Ψάχνω για ήδη εγκατεστημένα πακέτα..."
+msgstr "Αναζήτηση στα ήδη εγκατεστημένα πακέτα..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Αναζήτηση πακέτων π�ος αναβάθμιση..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -194,87 +291,87 @@ msgstr ""
 "\n"
 "Θέλετε π�αγματικά να αφαι�έστε αυτά τα πακέτα;\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Σφάλμα κατά την ανάγνωση του α�χείου %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "Έγινε αλλαγή των ονομάτων των πα�ακάτω πακέτων:"
+msgstr "Έγινε μετονομασία των πα�ακάτω δίσκων:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
-msgstr "%s (π�οηγουμένως ονομαζόταν %s)"
+msgstr "%s (η π�οηγο�μενη ονομασία ήταν %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Δίκτυο"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
-msgstr "Πα�ακαλώ, επέλεξε ένα μέσο"
+msgstr "Πα�ακαλώ επιλέξτε ένα μέσο"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Το α�χείο υπά�χει ήδη. �α αντικατασταθεί;"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
-msgstr "Δεν δόθηκε άδεια"
+msgstr "Ά�νηση αδείας"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
-msgstr "Λανθασμένο όνομα NFS"
+msgstr "Μη έγκυ�ο όνομα NFS"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
-msgstr "Εσφαλμένο μέσο %s"
+msgstr "Μη έγκυ�ο μέσο %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Αδ�νατη η λήψη στιγμιοτ�πων π�ιν από την δημιου�γία κατατμήσεων"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "Τα στιγμιότυπα θα είναι διαθέσιμα μετά την εγκατάστασης στο %s"
+msgstr "Τα στιγμιότυπα θα είναι διαθέσιμα μετά την εγκατάσταση στο %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Εγκατάσταση"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Ρ�θμιση"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Π�έπει επίσης να μο�φοποιήσετε το %s"
@@ -285,37 +382,36 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"Ένα μέ�ος του υλικο� σας χ�ειάζεται ``ιδιόκτητους'' οδηγο�ς για να "
+"Ένα μέ�ος του υλικο� σας χ�ειάζεται «ιδιόκτητους» οδηγο�ς για να "
 "λειτου�γήσει.\n"
 "Μπο�είτε να β�είτε σχετικές πλη�οφο�ίες στο: %s"
 
 #: interactive.pm:22
 #, c-format
 msgid "Bringing up the network"
-msgstr "Εκκίνηση δικτ�ου"
+msgstr "Εκκίνηση της διεπαφής δικτ�ου"
 
 #: interactive.pm:27
 #, c-format
 msgid "Bringing down the network"
-msgstr "Διακοπή λειτου�γίας δικτ�ου"
+msgstr "Διακοπή της διεπαφής δικτ�ου"
 
-# ????
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
-msgstr "Πα�ακαλώ πε�ιμένετε, γίνεται αναζήτηση του α�χείου"
+msgstr "Πα�ακαλώ πε�ιμένετε, γίνεται λήψη του α�χείου"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr "αδυναμία π�οσθήκης μέσου"
+msgstr "αδυναμία π�οσθήκης του μέσου"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
-msgstr "Αντιγ�αφή κάποιων πακέτων στο δίσκο, για μελλοντική χ�ήση"
+msgstr "Αντιγ�αφή κάποιων πακέτων στο δίσκο για μελλοντική χ�ήση"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Αντιγ�αφή σε εξέλιξη"
@@ -323,7 +419,7 @@ msgstr "Αντιγ�αφή σε εξέλιξη"
 #: pkgs.pm:32
 #, c-format
 msgid "must have"
-msgstr "π�έπει να υπά�χει"
+msgstr "υποχ�εωτικό"
 
 #: pkgs.pm:33
 #, c-format
@@ -333,19 +429,36 @@ msgstr "σημαντικό"
 #: pkgs.pm:34
 #, c-format
 msgid "very nice"
-msgstr "πολ� καλό"
+msgstr "πολ� χ�ήσιμο"
 
 #: pkgs.pm:35
 #, c-format
 msgid "nice"
-msgstr "καλό"
+msgstr "χ�ήσιμο"
 
 #: pkgs.pm:36
 #, c-format
 msgid "maybe"
 msgstr "ίσως"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Λήψη των πλη�οφο�ιών του πακέτου από τα μεταδεδομένα XML..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Δεν β�έθηκαν πλη�οφο�ίες xml για το μέσο «%s», μόνον εν μέ�ει αποτελέσματα "
+"για το πακέτο %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Χω�ίς πε�ιγ�αφή"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -354,343 +467,412 @@ msgstr ""
 "Κάποια πακέτα που ζητήθηκαν από το %s, δεν μπο�ο�ν να εγκατασταθο�ν:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
-msgstr "Π�οκλήθηκε σφάλμα :"
+msgstr "Πα�ουσιάστηκε ένα σφάλμα :"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Πα�ουσιάστηκε ένα κ�ίσιμο σφάλμα: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "�α μην ξαναγίνει η ε�ώτηση"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
-msgstr "Η %d συναλλαγή εγκατάστασης απέτυχε"
+msgstr "%d συναλλαγές εγκατάστασης απέτυχαν"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Η εγκατάσταση των πακέτων απέτυχε :"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
-msgstr "Σταθμός Ε�γασίας"
+msgstr "Σταθμός ε�γασίας"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
-msgstr "Σταθμός Ε�γασίας Γ�αφείου"
+msgstr "Σταθμός ε�γασίας γ�αφείου"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Ε�γαλεία γ�αφείου: Επεξε�γαστές κειμένου(OpenOffice.org Writer, Kword), "
-"λογιστικά φ�λλα (OpenOffice.org Calc, Kspread), α�χεία pdf κλπ"
+"Ε�γαλεία γ�αφείου: επεξε�γαστές κειμένου (LibreOffice Writer, Kword), "
+"λογιστικών φ�λλων (LibreOffice Calc, Kspread), π�οβολείς pdf, κλπ"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
-msgstr "Σταθμός παιχνιδιών"
+msgstr "Παιχνίδια"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Διασκέδαση (παιχνίδια)"
+msgstr ""
+"Π�ογ�άμματα διασκέδασης: ηλεκτ�ονικά παιχνίδια, επιτ�απέζια, στ�ατηγικής, κλπ"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
-msgstr "Σταθμός πολυμέσων"
+msgstr "Πολυμέσα"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
-msgstr "Π�ογ�άμματα αναπα�αγωγής και διαχεί�ισης video και ήχου"
+msgstr "Π�ογ�άμματα αναπα�αγωγής και επεξε�γασίας βίντεο και ήχου"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
-msgstr "Σταθμός Διαδικτ�ου"
+msgstr "Διαδίκτυο"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 "Ε�γαλεία για αποστολή και λήψη αλληλογ�αφίας και ειδήσεων (mutt, tin...) και "
-"πε�ιήγηση στο Διαδίκτυο"
+"για πε�ιήγηση στο διαδίκτυο"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
-msgstr "Υπολογιστής Δικτ�ου (πελάτης)"
+msgstr "Υπολογιστής δικτ�ου (πελάτης)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Πελάτες για διαφο�ετικά π�ωτόκολλα συμπε�ιλαμβανομένου του ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ε�γαλεία για διευκόλυνση της ��θμισης του υπολογιστή σας"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
-msgstr "Ε�γαλεία Κονσόλας"
+msgstr "Ε�γαλεία τε�ματικο�"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
-msgstr "Επεξε�γαστές κειμένου, κελ�φη, ε�γαλεία α�χείων, τε�ματικά"
+msgstr "Επεξε�γαστές, κελ�φη, ε�γαλεία α�χείων, τε�ματικά"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Ανάπτυξη"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
-msgstr "Βιβλιοθήκες ανάπτυξης C και C++, π�ογ�άμματα και άλλα α�χεία"
+msgstr "Βιβλιοθήκες ανάπτυξης C και C++, π�ογ�άμματα και α�χεία ενσωμάτωσης"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Τεκμη�ίωση"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
-msgstr "Βιβλία και οδηγοί για το Linux και το Ελε�θε�ο Λογισμικό"
+msgstr "Βιβλία και οδηγίες για το Linux και το ελε�θε�ο λογισμικό"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Υποστή�ιξη εφα�μογών τ�ίτων"
+msgstr "«Linux Standard Base». Υποστή�ιξη εφα�μογών τ�ίτων"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
-msgstr "Εξυπη�ετητής Ιστοσελίδων"
+msgstr "Εξυπη�ετητής ιστο�"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
-msgstr "Εξυπη�ετητής του Kolab"
+msgstr "Εξυπη�ετητής Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
-msgstr "Τοίχος Π�οστασίας/Δ�ομολογητής"
+msgstr "Τείχος π�οστασίας/Δ�ομολογητής"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
-msgstr "Π�λη Διαδικτ�ου"
+msgstr "Π�λη διαδικτ�ου"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
-msgstr "Αλληλογ�αφία/�έα"
+msgstr "Αλληλογ�αφία/Ειδήσεις"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Postfix server ταχυδ�ομείου, Inn server ειδήσεων"
+msgstr "Postfix εξυπη�ετητής ταχυδ�ομείου, εξυπη�ετητής ειδήσεων Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
-msgstr "Εξυπη�ετητής Καταλόγων"
+msgstr "Εξυπη�ετητής καταλόγων"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
-msgstr "Διακομιστής FTP"
+msgstr "Εξυπη�ετητής FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
-msgstr "Εξυπη�ετητής Όνομα Τομέα και Πλη�οφο�ιών Δικτ�ου"
+msgstr "Εξυπη�ετητής ονομάτων τομέα και πλη�οφο�ιών δικτ�ου"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Εξυπη�ετητής Κοινής Χ�ήσης Α�χείων και Εκτυπώσεων"
+msgstr "Εξυπη�ετητής κοινής χ�ήσης α�χείων και εκτυπωτών"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
-msgstr "Βάση Δεδομένων"
+msgstr "Βάση δεδομένων"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL και MySQL Database Server"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Εξυπη�ετητής βάσης δεδομένων PostgreSQL και MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
-msgstr "Web/FTP"
+msgstr "Ιστός/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
-msgstr "Ταχυδ�ομείο"
+msgstr "Αλληλογ�αφία"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
-msgstr "Εξυπη�ετητής ταχυδ�ομείου Postfix"
+msgstr "Εξυπη�ετητής αλληλογ�αφίας Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Εξυπη�ετητής βάσης δεδομένων PostgreSQL ή MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Εξυπη�ετητής βάσης δεδομένων PostgreSQL ή MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
-msgstr "Εξυπη�ετητής δικτ�ου"
+msgstr "Εξυπη�ετητής υπολογιστών δικτ�ου"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
-"εξυπη�ετητής NFS, εξυπη�ετητής SMB, εξυπη�ετητής Proxy, εξυπη�ετητής ssh"
+"Εξυπη�ετητής NFS, εξυπη�ετητής SMB, εξυπη�ετητής Proxy, εξυπη�ετητής ssh"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
-msgstr "Γ�αφικό Πε�ιβάλλον"
+msgstr "Γ�αφικό πε�ιβάλλον"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Σταθμός ε�γασίας KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
-msgstr "Το πε�ιβάλλον γ�αφείου KDE με μια συλλογή συνοδευτικών ε�γαλείων"
+msgstr ""
+"Το βασικό πε�ιβάλλον ε�γασίας KDE με μια συλλογή συνοδευτικών ε�γαλείων"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Σταθμός Ε�γασίας Gnome"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
-msgstr "Γ�αφικό πε�ιβάλλον με φιλικά ε�γαλεία και εφα�μογές"
+msgstr "Ένα γ�αφικό πε�ιβάλλον με φιλικά ε�γαλεία και εφα�μογές"
+
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Σταθμός ε�γασίας XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr "Ένα ελαφ�� γ�αφικό πε�ιβάλλον με φιλικά ε�γαλεία και εφα�μογές"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Σταθμός Ε�γασίας MATE"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Σταθμός ε�γασίας Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Γ�αφικό πε�ιβάλλον βασισμένο στο GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Πε�ιβάλλον ε�γασίας LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Μια νέας γενιάς μεταφο�ά σε Qt του ελαφ�ιο� γ�αφικο� πε�ιβάλλοντος"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Πε�ιβάλλον ε�γασίας Enlightenment e17 "
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Ένα ελαφ�� & γ�ήγο�ο γ�αφικό πε�ιβάλλον με αφοσιωμένους οπαδο�ς "
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
-msgstr "LXDE Γ�αφικό Πε�ιβάλλον Ε�γασίας"
+msgstr "Πε�ιβάλλον ε�γασίας LXDE"
+
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Ένα ελαφ�� και γ�ήγο�ο γ�αφικό πε�ιβάλλον"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Επιφάνειας ε�γασίας Plasma"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Ένα ελαφ�� & γ�ήγο�ο γ�αφικό πε�ιβάλλον με ένα σ�νολο φιλικών ε�γαλείων και "
-"εφα�μογών"
+"Η επιφάνεια ε�γασίας Plasma, το βασικό γ�αφικό πε�ιβάλλον ε�γασίας με μια "
+"συλλογή συνοδευτικών ε�γαλείων"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Άλλα γ�αφικά πε�ιβάλλοντα"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, κλπ"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, κλπ"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Ε�γαλεία"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Εξυπη�ετητής SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Webmin Server Απομακ�υσμένης Ρ�θμισης"
+msgstr "Webmin εξυπη�ετητής απομακ�υσμένης ��θμισης"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Ε�γαλεία Δικτ�ου/Πα�ακολο�θηση"
+msgstr "Ε�γαλεία δικτ�ου/εποπτεία δικτ�ου"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
-msgstr "Ε�γαλεία πα�ακολο�θησης, απολογισμός διε�γασιών, tcpdump, nmap, ..."
+msgstr "Ε�γαλεία εποπτείας, απολογισμός διε�γασιών, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
-msgstr "Οδηγοί Ρυθμίσεων Mageia"
+msgstr "Οδηγοί Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
-msgstr "Οδηγοί για τη ��θμιση εξυπη�ετητή"
+msgstr "Οδηγοί για τη ��θμιση του εξυπη�ετητή"
 
 #: steps.pm:85
 #, c-format
@@ -698,10 +880,10 @@ msgid ""
 "An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"Π�οκλήθηκε ένα σφάλμα που δεν ξέ�ω πώς να το χει�ιστώ.\n"
+"Πα�ουσιάστηκε ένα σφάλμα αλλά δεν ξέ�ω πώς να το χει�ιστώ.\n"
 "Συνεχίστε με δική σας ευθ�νη."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -710,355 +892,354 @@ msgid ""
 "\"\n"
 msgstr ""
 "Με�ικά σημαντικά πακέτα δεν εγκαταστάθηκαν σωστά.\n"
-"Ο οδηγός CD-ROM ή το CD-ROM είναι ελαττωματικό.\n"
-"Ελέγξτε το CD-ROM σε ένα άλλο σ�στημα χ�ησιμοποιώντας την εντολή \"rpm -qpl "
-"media/main/*.rpm\"\n"
+"Ο οδηγός CD ή το CD είναι ελαττωματικό.\n"
+"Ελέγξτε το CD σε ένα εγκατεστημένο σ�στημα χ�ησιμοποιώντας \" rpm -qpl media/"
+"main/*.rpm \"\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
 msgid "Entering step `%s'\n"
-msgstr "Βήμα `%s'\n"
+msgstr "Εκκίνηση του βήματος «%s»\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Εγκατάσταση της Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "%s Εγκατάσταση της %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> Αλλαγή πεδίου"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
-"Ο εξυπη�ετητής Xorg θέλει χ�όνο για να ξεκινήσει. Πα�ακαλώ πε�ιμένετε..."
+"Ο εξυπη�ετητής Xorg χ�ειάζεται χ�όνο για να ξεκινήσει. Πα�ακαλώ πε�ιμένετε..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Το σ�στημά σας δεν έχει α�κετο�ς πό�ους. Μπο�εί να αντιμετωπίσετε "
-"π�οβλήματα\n"
-"στην εγκατάσταση της Mageia Linux. Εάν συμβεί αυτό, μπο�είτε να δοκιμάσετε "
-"την εγκατάσταση κειμένου.\n"
-"Για να γίνει αυτό, πατήστε F1 κατά την εκκίνηση από το CDROM, και μετά "
-"γ�άψτε `text'."
+"Το σ�στημά σας διαθέτει πε�ιο�ισμένους πό�ους. Ίσως συναντήσετε π�οβλήματα\n"
+"κατά την εγκατάσταση της %s. Αν συμβεί αυτό, μπο�είτε να π�οσπαθήσετε\n"
+"την εγκατάσταση σε λειτου�γία κειμένου. Για να το π�αγματοποιήσετε, πατήστε "
+"«F1»\n"
+"κατά την εκκίνηση του CD-ROM και εισάγετε «text»."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Εγκατάσταση του Mageia KDE Desktop"
+msgid "Media Selection"
+msgstr "Επιλογή μέσων"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Εγκατάσταση του Mageia GNOME Desktop"
+msgid "Install %s KDE Desktop"
+msgstr "Εγκατάσταση του πε�ιβάλλοντος KDE της %s"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Εγκατάσταση του πε�ιβάλλοντος GNOME της %s"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Π�οσα�μοσμένη εγκατάσταση"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
-msgstr "KDE Γ�αφικό Πε�ιβάλλον Ε�γασίας"
+msgstr "Πε�ιβάλλον ε�γασίας KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
-msgstr "IceWm Γ�αφικό Πε�ιβάλλον Ε�γασίας"
+msgstr "Πε�ιβάλλον ε�γασίας GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
-msgstr "Π�οσα�μοσμένο Γ�αφικό Πε�ιβάλλον Ε�γασίας"
+msgstr "Π�οσα�μοσμένο πε�ιβάλλον ε�γασίας"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
-msgstr "Αυτή είναι μία π�οεπισκόπηση του γ�αφικο� πε�ιβάλλοντος ε�γασίας '%s'."
+msgstr "Αυτή είναι μια π�οεπισκόπηση του πε�ιβάλλοντος ε�γασίας «%s»."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
-msgstr "Κάνε κλικ στις εικόνες, για να δεις τη μεγαλ�τε�η π�οεπισκόπηση"
+msgstr "Κάντε κλικ στις εικόνες, για να δείτε μια μεγαλ�τε�η π�οεπισκόπηση"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
-msgstr "Επιλογή ομάδας πακέτων"
+msgstr "Επιλογή ομάδων πακέτων"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
-msgstr "Επιλογή ξεχω�ιστών πακέτων"
+msgstr "Επιλογή μεμονωμένων πακέτων"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Συνολικό μέγεθος: %d / %d MB"
+msgid "Unselect All"
+msgstr "Αποεπιλογή όλων"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Λάθος πακέτο"
+msgid "Total size: %d / %d MB"
+msgstr "Συνολικό μέγεθος: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Έκδοση: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Μέγεθος: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Σπουδαιότητα: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
-msgstr "Δεν μπο�είτε να επιλέξετε/αποεπιλέξετε αυτό το πακέτο"
+msgid "You cannot select/unselect this package"
+msgstr "Δεν είναι δυνατή η επιλογή/αποεπιλογή του συγκεκ�ιμένου πακέτου"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
-msgstr "λόγω ελλείψεων %s"
+msgstr "λόγω έλλειψης του %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
-msgstr "λόγω μη ικανοποίησης %s"
+msgstr "λόγω μη ικανοποίησης του %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
-msgstr "π�οσπάθεια ενίσχυσης του %s"
+msgstr "π�οσπάθεια π�οώθησης του %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "για να κ�ατηθεί το %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
-"Δεν μπο�είτε να επιλέξετε αυτό το πακέτο διότι δεν υπά�χει α�κετός χώ�ος"
+"Δεν μπο�είτε να επιλέξετε αυτό το πακέτο διότι δεν υπά�χει α�κετός ελε�θε�ος "
+"χώ�ος για να το εγκαταστήσετε."
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Θα εγκατασταθο�ν τα πα�ακάτω πακέτα"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Θα αφαι�εθο�ν τα πα�ακάτω πακέτα "
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
-msgstr "Αυτό είναι απαιτο�μενο πακέτο, δεν μπο�εί να αποεπιλεγεί"
+msgid "This is a mandatory package, it cannot be unselected"
+msgstr "Αυτό το πακέτο είναι απα�αίτητο, δεν μπο�εί να αποεπιλεγεί"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Δεν μπο�είτε να αποεπιλέξετε αυτό το πακέτο. Είναι ήδη εγκατεστημένο"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Δεν μπο�είτε να αποεπιλέξετε αυτό το πακέτο. Π�έπει να αναβαθμιστεί"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
-msgstr "Αυτόματη π�οβολή επιλεγμένων πακέτων"
+msgstr "Εμφάνιση των επιλεγμένων πακέτων αυτόματα"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Εγκατάσταση"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
-msgstr "Επιλογή Φό�τωσης/Αποθήκευσης"
+msgstr "Φό�τωση/αποθήκευση της επιλογής"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
-msgstr "Ανανέωση επιλεγμένων πακέτων"
+msgstr "Ενημέ�ωση της επιλογής των πακέτων"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
-msgstr "Ελάχιστη Εγκατάσταση"
+msgstr "Ελάχιστη εγκατάσταση"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
-msgstr "Διαχεί�ιση Λογισμικο�"
+msgstr "Διαχεί�ιση λογισμικο�"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Επιλέξτε τα πακέτα που θέλετε να εγκαταστήσετε"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Εγκατάσταση"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Χω�ίς λεπτομέ�ειες"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Χ�όνος που απομένει:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(εκτίμηση...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d πακέτο"
 msgstr[1] "%d πακέτα"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
-msgstr "Πε�ίληψη"
+msgstr "Σ�νοψη"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Ρ�θμιση"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "δεν �υθμίστηκε"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Επιλογή Μέσου"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 "Β�έθηκαν τα ακόλουθα μέσα εγκατάστασης.\n"
-"Αν θες να πα�αλειφθο�ν κάποια από αυτά, μπο�είς να τα αποεπιλέξεις τώ�α."
+"Αν θέλετε να πα�αλείψετε κάποια από αυτά, μπο�είτε να τα αποεπιλέξετε τώ�α."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Έχετε την δυνατότητα να αντιγ�άψετε το πε�ιεχόμενο των CD στο σκλη�ό δίσκο "
 "π�ιν την εγκατάσταση.\n"
-"Η οποία θα συνεχιστεί από τον σκλη�ό δίσκο και τα πακέτα θα μείνουν "
-"διαθέσιμα και μετά το τέλος της εγκατάστασης."
+"Αυτή θα συνεχιστεί από τον σκλη�ό δίσκο και τα πακέτα θα πα�αμείνουν "
+"διαθέσιμα και μετά το τέλος της."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
-msgstr "Αντιγ�αφή ολόκλη�ων CD"
+msgstr "Αντιγ�αφή ολόκλη�ων των CD"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
-msgstr "Π�οκλήθηκε σφάλμα"
+msgstr "Πα�ουσιάστηκε ένα σφάλμα "
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
-msgstr "Πα�ακαλώ επέλεξε τη διάταξη του πληκτ�ολογίου σου"
+msgstr "Πα�ακαλώ επιλέξτε τη διάταξη του πληκτ�ολογίου σας"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Αυτή είναι η πλή�ης λίστα με τα διαθέσιμα πληκτ�ολόγια:"
 
-#: steps_interactive.pm:146
+# Απαλοιφή τόνου, μετατ�έπεται αυτόματα σε κεφαλαία #5755.
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
-msgstr "Εγκατάσταση/Αναβάθμιση"
+msgstr "ΕΓΚΑΤΑΣΤΑΣΗ/Α�ΑΒΑΘΜΙΣΗ"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "Π�όκειται για εγκατάσταση ή για αναβάθμιση;"
+msgstr "Επιθυμείτε να κάνετε μια εγκατάσταση ή αναβάθμιση;"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
-msgstr ""
-"_: Αυτό είναι ένα ουσιαστικό:\n"
-"Εγκατάσταση"
+msgstr "Εγκατάσταση"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
-msgstr "Αναβάθμιση %s"
+msgstr "Αναβάθμιση της %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Κλειδί κ�υπτογ�άφησης για το %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Ακ��ωση της εγκατάστασης, επανεκκίνηση του συστήματος"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "�έα εγκατάσταση"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
-msgstr "Αναβάθμιση π�οηγο�μενης εγκατάστασης (δεν συστήνεται)"
+msgstr "Αναβάθμιση της π�οηγο�μενης εγκατάστασης (δεν συστήνεται)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1066,49 +1247,27 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Το π�όγ�αμμα εγκατάστασης αποφάνθηκε, ότι το ήδη υπά�χον\n"
-"σ�στημα Mageia Linux, δεν μπο�εί να αναβαθμιστεί με ασφάλεια στην έκδοση "
-"%s.\n"
+"Ο εγκαταστάτης εντόπισε ότι το εγκατεστημένο σας σ�στημα Mageia Linux δεν "
+"μπο�εί\n"
+"να αναβαθμιστεί με ασφάλεια σε %s.\n"
 "\n"
-"Π�οτείνεται να γίνει νέα εγκατάσταση, που θα αντικαταστήσει την "
-"π�οηγο�μενη.\n"
+"Συνιστάται να αντικαταστήσετε την εγκατάστασή σας με μια νέα.\n"
 "\n"
-"Π�οειδοποίηση : θα π�έπει να πά�εις αντίγ�αφα ασφαλείας από όλα τα π�οσωπικά "
-"σου\n"
-"δεδομένα και τα έγγ�αφα π�ιν επιλέξεις τη \"�έα Εγκατάσταση\"."
+"Π�οσοχή: θα π�έπει να πά�ετε αντίγ�αφα ασφαλείας όλων των π�οσωπικών σας "
+"δεδομένων π�ιν επιλέξετε\n"
+"«�έα εγκατάσταση»."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Ρ�θμιση IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Δεν υπά�χει ελε�θε�ος χώ�ος για 1MB bootstrap! Η εγκατάσταση θα συνεχιστεί, "
-"αλλά για να ξεκινήσετε το σ�στημά σας, θα χ�ειαστεί να δημιου�γήσετε μια "
-"κατάτμηση bootstrap με το DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Π�έπει να δημιου�γήσετε την κατάτμηση ένα�ξης (PPC PReP Boot bootstrap). Η "
-"εγκατάσταση θα συνεχιστεί, αλλά για να εκκινήσετε το σ�στημά σας, θα π�έπει "
-"να δημιου�γήσετε την κατάτμηση ένα�ξης από το DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1117,18 +1276,17 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "Αλλάξτε το Cd-Rom!\n"
-"\n"
-"Πα�ακαλώ εισάγετε το Cd-Rom με όνομα \"%s\" στον οδηγό σας και πατήστε "
-"Εντάξει.\n"
-"Εάν δεν το έχετε, πατήστε Ακ��ωση για αποφυγή εγκατάστασης από αυτό το Cd-"
-"Rom."
+"Πα�ακαλώ εισάγετε το Cd-Rom με όνομα «%s» στον οδηγό σας και πατήστε "
+"«Εντάξει».\n"
+"Εάν δεν το έχετε, πατήστε «Ακ��ωση» για αποφυγή της εγκατάστασης από αυτό το "
+"Cd-Rom."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
-msgstr "Ψάχνω για διαθέσιμα πακέτα..."
+msgstr "Αναζήτηση για διαθέσιμα πακέτα..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1137,7 +1295,7 @@ msgstr ""
 "Το σ�στημά σας δεν έχει α�κετό ελε�θε�ο χώ�ο για την εγκατάσταση ή την "
 "αναβάθμιση (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1145,147 +1303,178 @@ msgid ""
 msgstr ""
 "Πα�ακαλώ, επέλεξε τη φό�τωση ή την αποθήκευση της λίστας με τα επιλεγμένα "
 "πακέτα.\n"
-"Η μο�φή είναι η ίδια με τα α�χεία auto_install (αυτόματης εγκατάστασης)."
+"Η μο�φή είναι η ίδια με αυτή της αυτόματης εγκατάστασης (auto_install)."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
-msgstr "Φό�τος"
+msgstr "Φό�τωση"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
-msgstr "Λανθασμένο α�χείο"
+msgstr "Μη έγκυ�ο α�χείο"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+# Απαλοιφή τόνου, μετατ�έπεται αυτόματα σε κεφαλαία #5755.
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
-msgstr "Επιλογή Γ�αφικο� Πε�ιβάλλοντος Ε�γασίας"
+msgstr "ΕΠΙΛΟΓΗ ΠΕΡΙΒΑΛΛΟ�ΤΟΣ ΕΡΓΑΣΙΑΣ"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
-"Μπο�είς να επιλέξεις το π�οφίλ για το γ�αφικό πε�ιβάλλον ε�γασίας του "
-"υπολογιστή σου."
+"Μπο�είτε να επιλέξετε το π�οφίλ για το πε�ιβάλλον ε�γασίας του υπολογιστή "
+"σας."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Το επιλεγμένο μέγεθος είναι μεγαλ�τε�ο από το διαθέσιμο χώ�ο"
 
-#: steps_interactive.pm:576
+# Απαλοιφή τόνου, μετατ�έπεται αυτόματα σε κεφαλαία #5755.
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
-msgstr "Τ�πος εγκατάστασης"
+msgstr "ΤΥΠΟΣ ΕΓΚΑΤΑΣΤΑΣΗΣ"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 "Δεν έχετε επιλέξει κάποια ομάδα πακέτων.\n"
-"Πα�ακαλώ επιλέξτε την ελάχιστη εγκατάσταση που θέλετε:"
+"Πα�ακαλώ επιλέξτε την ελάχιστη εγκατάσταση που επιθυμείτε:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Με Χ"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Εγκατάσταση των π�οτεινόμενων πακέτων"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Με την βασική τεκμη�ίωση (συνιστάται!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Π�αγματικά ελάχιστη εγκατάσταση (ειδικά χω�ίς urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Π�οετοιμασία της αναβάθμισης..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Π�οετοιμασία της εγκατάστασης"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Εγκατάσταση του πακέτου %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
-msgstr "Π�οκλήθηκε σφάλμα κατά την ταξινόμηση των πακέτων:"
+msgstr "Πα�ουσιάστηκε σφάλμα κατά την ταξινόμηση των πακέτων:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "�α συνεχίσω;"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
-msgstr "Π�οσπάθησε ξανά"
+msgstr "Π�οσπάθεια ξανά"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
-msgstr "Πα�άβλεψη αυτο� του πακέτου"
+msgstr "Πα�άλειψη αυτο� του πακέτου"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
-msgstr "Πα�άβλεψη όλων των πακέτων από το μέσο \"%s\""
+msgstr "Πα�άλειψη όλων των πακέτων από το μέσο «%s»"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Επιστ�οφή στην επιλογή μέσων και πακέτων"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
-msgstr "Π�οκλήθηκε σφάλμα κατά την εγκατάσταση του πακέτου %s."
+msgstr "Πα�ουσιάστηκε σφάλμα κατά την εγκατάσταση του πακέτου %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Ρυθμίσεις μετά την εγκατάσταση"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
-"Πα�ακαλώ σιγου�ευτείτε ότι το μέσο ενημέ�ωσης των οδηγών (modules) είναι "
-"μέσα στην συσκευή %s"
+"Πα�ακαλώ σιγου�ευτείτε ότι το μέσο ενημέ�ωσης των α�θ�ωμάτων (modules) είναι "
+"μέσα στον οδηγό %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Ενημε�ώσεις"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+"Σε αυτό το βήμα σας δίδεται η δυνατότητα να π�οσθέσετε μέσα από το διαδίκτυο."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Αυτό επιτ�έπει την εγκατάσταση των ενημε�ώσεων ασφαλείας."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Για την π�οσθήκη αυτών των μέσων, απαιτείται μια ενε�γή σ�νδεση\n"
+"στο διαδίκτυο.\n"
+"\n"
+"Επιθυμείτε την π�οσθήκη των μέσων ενημέ�ωσης;"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1298,140 +1487,126 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Τώ�α έχετε την ευκαι�ία να κάνετε λήψη ενημε�ωμένων πακέτων.\n"
-"Αυτά τα πακέτα έχουν ενημε�ωθεί μετά την έκδοση της διανομής. Μπο�εί να "
-"πε�ιέχουν\n"
-"διο�θώσεις σφαλμάτων ή ενημε�ώσεις ασφαλείας.\n"
+"Αυτά τα πακέτα έχουν ενημε�ωθεί μετά την έκδοση της διανομής. Μπο�εί να\n"
+"πε�ιέχουν διο�θώσεις σφαλμάτων ή ενημε�ώσεις ασφαλείας.\n"
 "\n"
-"Για να κάνετε λήψη αυτών των πακέτων π�έπει να έχετε μια ενε�γοποιημένη "
-"σ�νδεση με το διαδίκτυο.\n"
+"Για να κάνετε λήψη αυτών των πακέτων π�έπει να έχετε ενε�γοποιημένη\n"
+"τη σ�νδεση με το διαδίκτυο.\n"
 "\n"
 "Θέλετε να εγκαταστήσετε τις ενημε�ώσεις ;"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s σε %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Υλικό"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Κά�τα ήχου"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Έχετε κά�τα ήχου ISA;"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
-"Εκτέλεσε την εντολή \"alsaconf\" ή \"sndconfig\", μετά την εγκατάσταση, για "
-"να �υθμίσεις την κά�τα ήχου"
+"Εκτελέστε την εντολή «alsaconf» ή «sndconfig», μετά την εγκατάσταση για να "
+"�υθμίσετε την κά�τα ήχου"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr ""
-"Δεν β�έθηκε κά�τα ήχου. Δοκιμάστε το \"harddrake\" μετά την εγκατάσταση"
+msgstr "Δεν β�έθηκε κά�τα ήχου. Δοκιμάστε το «harddrake» μετά την εγκατάσταση"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Γ�αφικό πε�ιβάλλον"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Δίκτυο & Διαδίκτυο"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
-msgstr "Διαμεσολαβητές (proxies)"
+msgstr "Διαμεσολαβητές"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "�υθμισμένο"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
-msgstr "Επίπεδο Ασφαλείας"
+msgstr "Επίπεδο ασφαλείας"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
-msgstr "Τοίχος Π�οστασίας"
+msgstr "Τείχος π�οστασίας"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "ενε�γοποιημένο"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "απενε�γοποιημένο"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
-msgstr "Δεν έχετε �υθμίσει το Χ. Είστε βέβαιοι ότι θέλετε να το κάνετε;"
+msgstr "Δεν έχετε �υθμίσει τον Χ. Είστε σίγου�ος/η ότι θέλετε π�αγματικά αυτό;"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Π�οετοιμασία του π�ογ�άμματος εκκίνησης..."
+msgid "Preparing initial startup program..."
+msgstr "Π�οετοιμασία του α�χικο� π�ογ�άμματος εκκίνησης..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Πα�ακαλώ πε�ιμένετε, η διαδικασία μπο�εί να δια�κέσει με�ικά λεπτά ..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Φαίνεται πως έχετε ένα Α�χαίο ή Άγνωστο\n"
-"μηχάνημα, ο yaboot bootloader δεν θα δουλέψει για σας.\n"
-"Η εγκατάσταση θα συνεχιστεί, αλλά\n"
-"θα χ�ειαστεί να χ�ησιμοποιήσετε το BootX ή μια άλλη μέθοδο για να ξεκινήσετε "
-"το μηχάνημά σας. Η πα�άμετ�ος για το root fs είναι: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
-"Σε αυτό το επίπεδο ασφαλείας, η π�όσβαση στα α�χεία στην κατάτμηση των "
-"windows πε�ιο�ίζεται μόνο για τον διαχει�ιστή."
+"Σε αυτό το επίπεδο ασφαλείας, μόνο ο διαχει�ιστής έχει π�όσβαση στα α�χεία "
+"στην κατάτμηση των Windows."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
-msgstr "Εισάγετε άδεια δισκέτα στον οδηγό %s"
+msgstr "Εισάγετε μια άδεια δισκέτα στον οδηγό %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Δημιου�γία δισκέτας αυτόματης εγκατάστασης..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1442,12 +1617,13 @@ msgstr ""
 "\n"
 "Θέλετε σίγου�α να εγκαταλείψετε τώ�α;"
 
-#: steps_interactive.pm:1106
+# Απαλοιφή τόνου, μετατ�έπεται αυτόματα σε κεφαλαία #5755.
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
-msgstr "Συγχα�ητή�ια"
+msgstr "ΣΥΓΧΑΡΗΤΗΡΙΑ"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Επανεκκίνηση"
@@ -1458,19 +1634,19 @@ msgstr "Επανεκκίνηση"
 msgid ""
 "_: Keep these entry short\n"
 "Language"
-msgstr "Επιλέξτε γλώσσα"
+msgstr "Γλώσσα"
 
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr "Τοπικοποίηση"
+msgstr "Τοπικότητα"
 
 #: steps_list.pm:17
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "License"
-msgstr "Άδεια Χ�ήσης"
+msgstr "Άδεια χ�ήσης"
 
 #: steps_list.pm:18
 #, c-format
@@ -1484,15 +1660,16 @@ msgstr "Ποντίκι"
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
-msgstr "Εντοπισμός δίσκου"
+msgstr "Ανίχνευση σκλη�ών δίσκων"
 
 #: steps_list.pm:21 steps_list.pm:22
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Installation class"
-msgstr "Κλάση της εγκατάστασης"
+msgstr "Κλάση εγκατάστασης"
 
+# Απαλοιφή τόνου, μετατ�έπεται αυτόματα σε κεφαλαία #5755.
 #: steps_list.pm:23
 #, c-format
 msgid ""
@@ -1512,14 +1689,14 @@ msgstr "Ασφάλεια"
 msgid ""
 "_: Keep these entry short\n"
 "Partitioning"
-msgstr "Καταμε�ισμός"
+msgstr "Διαμε�ισμός"
 
 #: steps_list.pm:27 steps_list.pm:28
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Formatting"
-msgstr "Διαμό�φωση "
+msgstr "Μο�φοποίηση "
 
 #: steps_list.pm:29
 #, c-format
@@ -1542,33 +1719,26 @@ msgid ""
 "Users"
 msgstr "Χ�ήστες"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Δικτ�ωση"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Bootloader"
-msgstr "Π�όγ�. εκκίνησης"
+msgstr "Εκκίνηση"
 
 #: steps_list.pm:40 steps_list.pm:41
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Configure X"
-msgstr "Ρ�θμιση Χ"
+msgstr "Ρ�θμιση του Χ"
 
 #: steps_list.pm:42
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Summary"
-msgstr "Πε�ίληψη"
+msgstr "Σ�νοψη"
 
 #: steps_list.pm:44 steps_list.pm:45
 #, c-format
@@ -1591,174 +1761,81 @@ msgid ""
 "Exit"
 msgstr "Έξοδος"
 
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Ε�γαλεία γ�αφείου: Επεξε�γαστές κειμένου(kword, abiword), λογιστικά φ�λλα "
-#~ "(kspread, gnumeric), α�χεία pdf κλπ"
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Π�οετοιμασία του π�ογ�άμματος εκκίνησης..."
 
 #~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
 #~ msgstr ""
-#~ "Αποφασίσατε να αναβαθμίσετε το σ�στημα σας σε %s. KDE 3.5\n"
-#~ "ανιχνε�θηκε εγκατεστημένο στο σ�στημά σας. Αυτός ο οδηγός εγκατάστασης "
-#~ "δεν μπο�εί να διατη�ήσει το KDE 3.5 σε κατάσταση αναβάθμισης.\n"
-#~ "Εάν επιθυμείτε να συνεχίσετε, το KDE 4 θα αντικαταστήσει το KDE 3, και θα "
-#~ "χάσετε τις π�οσωπικές σας �υθμίσεις KDE. \n"
-#~ "Για να κάνετε την αναβάθμιση διατη�ώντας τις π�οσωπικές σας �υθμίσεις, \n"
-#~ "πα�ακαλώ επανεκκινήστε τον υπολογιστή σας και κάντε την αναβάθμιση από "
-#~ "την εφα�μογή ενημέ�ωσης του συστήματος Mandriva."
-
-#~ msgid "Proceed"
-#~ msgstr "Συνέχεια"
+#~ "Ένα ελαφ�� & γ�ήγο�ο γ�αφικό πε�ιβάλλον με ένα σ�νολο φιλικών ε�γαλείων "
+#~ "και εφα�μογών"
 
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "αποτυχία ανάκτησης του [%s]"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Λήψη α�χείου %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr "Η αναβάθμιση της διανομής από 32bit σε 64bit δεν υποστη�ίζεται "
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr "Η αναβάθμιση της διανομής από 64bit σε 32bit δεν υποστη�ίζεται"
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Πε�ιβάλλον ε�γασίας RazorQt"
 
 #~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
 #~ msgstr ""
-#~ "Έχετε επιλέξει τους πα�ακάτω διακομιστές(η): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Αυτοί οι διακομιστές είναι εξ ο�ισμο� ενε�γoί. Δεν έχουν κάποιο γνωστό "
-#~ "π�όβλημα\n"
-#~ "ασφάλειας, αλλά μπο�ο�ν να β�εθο�ν νέα. Σε αυτή την πε�ίπτωση βεβαιωθείτε "
-#~ "ότι\n"
-#~ "έχετε εγκαταστήσει την τελευταία έκδοση, το συντομότε�ο.\n"
-#~ "\n"
-#~ "\n"
-#~ "Είστε βέβαιοι για την εγκατάσταση αυτών των διακομιστών;\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "IceWm Desktop"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "Σ�νδεση με τον τόπο για την λήψη των διαθέσιμων πακέτων..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Αδυναμία επικοινωνίας με την εναλλακτική τοποθεσία %s"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Θέλετε να χ�ησιμοποιήσετε το aboot;"
+#~ "Δεν υπά�χει ελε�θε�ος χώ�ος για 1MB bootstrap! Η εγκατάσταση θα "
+#~ "συνεχιστεί, αλλά για να ξεκινήσετε το σ�στημά σας, θα χ�ειαστεί να "
+#~ "δημιου�γήσετε μια κατάτμηση bootstrap με το DiskDrake"
 
 #~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
 #~ msgstr ""
-#~ "Σφάλμα κατά την εγκατάσταση του aboot. \n"
-#~ "�α γίνει ππ�οσπάθεια βεβιασμένης εγκατάστασης, ακόμα και αν αυτό έχει σαν "
-#~ "αποτέλεσμα την καταστ�οφή της π�ώτης κατάτμησης;"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Δημιου�γία δισκέτας αυτόματης εγκατάστασης"
+#~ "Π�έπει να δημιου�γήσετε την κατάτμηση εκκίνησης (PPC PReP Boot "
+#~ "bootstrap). Η εγκατάσταση θα συνεχιστεί, αλλά για να εκκινήσετε το "
+#~ "σ�στημά σας, θα π�έπει να δημιου�γήσετε την κατάτμηση εκκίνησης από το "
+#~ "DiskDrake"
 
 #~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
 #~ msgstr ""
-#~ "Η αυτόματη εγκατάσταση μπο�εί να είναι πλή�ως αυτόματη, κατά π�οτίμηση.\n"
-#~ "Σε αυτή την πε�ίπτωση, θα πά�ει τον έλεγχο του σκλη�ο� δίσκου\n"
-#~ "(αυτό είναι χ�ήσιμο σε πε�ιπτώσεις εγκατάστασης σε άλλο υπολογιστή).\n"
-#~ "\n"
-#~ "Ίσως να π�οτιμο�σες να επαναλάβεις την εγκατάσταση.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Επανάληψη"
-
-#~ msgid "Automated"
-#~ msgstr "Αυτόματο"
+#~ "Φαίνεται πως έχετε ένα α�χαίο ή αγνώστου τ�που υπολογιστή, το π�όγ�αμμα "
+#~ "εκκίνησης yaboot δεν θα δουλέψει για σας. Η εγκατάσταση θα συνεχιστεί, "
+#~ "αλλά θα χ�ειαστεί να χ�ησιμοποιήσετε το BootX ή μια άλλη μέθοδο για την "
+#~ "εκκίνηση του υπολογιστή σας. Η πα�άμετ�ος πυ�ήνα για το root fs είναι: "
+#~ "root=%s"
 
-#~ msgid "Save packages selection"
-#~ msgstr "Αποθήκευση επιλογής πακέτων"
+#~ msgid "Welcome"
+#~ msgstr "Καλώς ή�θατε"
 
-#~ msgid "All"
-#~ msgstr "Όλα"
+#~ msgid "People!"
+#~ msgstr "Άνθ�ωποι!"
 
-#~ msgid "TV card"
-#~ msgstr "Κά�τα TV"
+#~ msgid "For people"
+#~ msgstr "Για ανθ�ώπους"
 
-#~ msgid "Boot"
-#~ msgstr "Εκκίνηση"
+#~ msgid "For contributors"
+#~ msgstr "Για συνεισφέ�οντες"
 
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Πιστοποίηση"
-
-#~ msgid "Gwenview"
-#~ msgstr "Gwenview"
-
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "(%d πακέτο, %d MB)"
-#~ msgstr[1] "(%d πακέτα, %d MB)"
-
-#~ msgid "%d packages"
-#~ msgstr "%d πακέτα"
-
-#~ msgid "Language"
-#~ msgstr "Επιλέξτε γλώσσα"
+#~ msgid "For you"
+#~ msgstr "Για σας"
 
-#~ msgid "License"
-#~ msgstr "Άδεια Χ�ήσης"
+#~ msgid "Welcome!"
+#~ msgstr "Καλώς ή�θατε!"
 
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "Επιλέξτε εγκατάσταση"
+#~ msgid "Select All"
+#~ msgstr "Επιλογή όλων"
 
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "Εκτίμηση"
+#~ msgid "Bad package"
+#~ msgstr "Μη έγκυ�ο πακέτο"
 
 #, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "Επιλογή πακέτων"
-
-#~ msgid "Users"
-#~ msgstr "Χ�ήστες"
+#~ msgid "Preparing boot images..."
+#~ msgstr "Π�οετοιμασία του π�ογ�άμματος εκκίνησης..."
 
-#~ msgid "Networking"
-#~ msgstr "Δικτ�ωση"
-
-#~ msgid "Configure X"
-#~ msgstr "Ρ�θμιση Χ"
+#~ msgid "Mageia, the new Linux distribution"
+#~ msgstr "Mageia, η νέα διανομή Linux"
 
 #~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "Αδυναμία π�όσβασης των α�θ�ωμάτων που αντιστοιχο�ν στον πυ�ήνα σας (το "
-#~ "α�χείο %s λείπει), γενικά αυτό σημαίνει ότι η δισκέτα εκκίνησης δεν είναι "
-#~ "σε συγχ�ονισμό με το Μέσο εγκατάστασης ( πα�ακαλώ δημιου�γήστε μια νέα "
-#~ "δισκέτα εκκίνησης)"
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Δίκτυο"
diff --git a/perl-install/install/share/po/eo.po b/perl-install/install/share/po/eo.po
index 61c4b39ce..7ce621682 100644
--- a/perl-install/install/share/po/eo.po
+++ b/perl-install/install/share/po/eo.po
@@ -1,57 +1,82 @@
-# translation of eo.po to Esperanto
-# translation of DrakX-eo.po to
-# Esperanto drakbootdisk
-# Copyright (C) 2000, 2001 Mandriva
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# D. Dale Gulledge <dsplat@rochester.rr.com>, 2000.
-# Vilhelmo Lutermano <vlutermano@free.fr>, 2007.
+# Translators:
+# D. Dale Gulledge <dsplat@rochester.rr.com>, 2000
+# Vilhelmo Lutermano <vlutermano@free.fr>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: eo\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2007-12-29 05:55+0100\n"
-"Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
-"Language-Team: Esperanto <eo@li.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 04:07+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/mageia/"
+"language/eo/)\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Ĉu vi havas plian kroman datenportilon?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -64,93 +89,91 @@ msgstr ""
 "\n"
 "Ĉu vi havas kroman instalan datenportilon por konfiguri? "
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "KD-ROMo"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Reto (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Reto (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Reto (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL de la spegulo?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL devas komenci per ftp:// aÅ­ http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Mi kontaktas la Mageia Linuksan retpa�on por havigi la liston de disponeblaj "
+"Mi kontaktas la %s Linuksan retpa�on por havigi la liston de disponeblaj "
 "speguloj..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Mi malsukcesis kontakti la Mageia Linuksan retpa�on por havigi la liston de "
+"Mi malsukcesis kontakti la %s Linuksan retpa�on por havigi la liston de "
 "disponeblaj speguloj..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Elektu spegulon de kiu havigi la pakaĵojn"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-agordo"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Bonvole enigu la nomon kaj dosierujon de via NSF-datenportilo"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Nomo mankas"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Dosierujo devas komenci per \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Nomo de la NFS surmeto?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Dosierujo"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Kroma"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -159,23 +182,90 @@ msgstr ""
 "Mi ne trovas pakaĵlistan dosieron sur tiu spegulo. Certi�u ke la adreso "
 "estas �usta."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Rigardante jam instalitajn pakaĵojn..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Trovadas pakaĵojn por promocii"
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Mi forigas pakaĵojn antaŭ ol �isdatigi..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -188,87 +278,87 @@ msgstr ""
 "\n"
 "Ĉu vi vere deziras forigi tiujn pakaĵojn?\n"
 
-#: any.pm:813
-#, fuzzy, c-format
+#: any.pm:1096
+#, c-format
 msgid "Error reading file %s"
-msgstr "Mi de�utas dosieron %s..."
+msgstr ""
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "La sekva(j) disko(j) estas alinomitaj:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (antaÅ­e nomitaj kiel %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Reto"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Bonvole elektu datenportilon"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Dosiero jam ekzistas.  Ĉu surskribi �in?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permeso rifuzita"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Mal�usta NFS-nomo"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Malbona datenportilo %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Mi ne povas fari ekranfotojn antaÅ­ ol subdiskigi"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekranfotoj haveblos post instalado en %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalado"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurado"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Vi devas ankaÅ­ formati %s"
@@ -293,22 +383,22 @@ msgstr "Startado de la reto"
 msgid "Bringing down the network"
 msgstr "Haltas de la reto"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Mi kopias kelkajn pakaĵojn sur diskoj por estonta uzo"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Mi estas kopianta"
@@ -338,7 +428,23 @@ msgstr "agrabla(j)"
 msgid "maybe"
 msgstr "elbe"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Nenia xml-informo por aŭdvidaĵo \"%s\", nur parta rezulto por pakaĵo %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Nenia priskribo"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -347,66 +453,76 @@ msgstr ""
 "Kelkaj pakaĵoj bezonataj de %s ne instaleblas:\n"
 "%s"
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "Eraro okazis"
+msgstr "Eraro okazis:"
+
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Okazis fatala eraro: %s."
 
-#: pkgs.pm:814
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instal-transakcioj malsukcesis"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "Instalanta pakaĵo %s"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Laborstacio"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Oficeja laborstacio"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Oficejaj programoj: tekstiloj (OpenOffice.org Writer, Verkilo [Kword]), "
-"tabelkalkuliloj (OpenOffice.org Calc, Kspread), PDF-vidigiloj, ktp."
+"Oficejaj programoj: tekstiloj (LibreOffice Writer, Verkilo [Kword]), "
+"tabelkalkuliloj (LibreOffice Calc, Kspread), PDF-vidigiloj, ktp."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Ludstacio"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Amuz-programoj: arcade, tabuloj [boards], strategio, ktp."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Plurmediaj stacio"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programoj por ludi/prilabori son- kaj video-programojn"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Interreta stacio"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -415,269 +531,326 @@ msgstr ""
 "Agordiloj por legi kaj sendi retpo�t-mesa�ojn kaj novaĵojn (mutt, tin...) "
 "kaj por krozi tra la ttt"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Reta computilo (kliento)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klientoj por diversaj protokoloj inklude de ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Iloj por faciligi la konfiguradon de via komputilo"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsoliloj"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktiloj, �eloj, dosieriloj, terminaloj"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Programado"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C kaj C++ programadaj bibliotekoj, programoj kaj ĉapdosieroj"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentaro"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Libroj kaj Kielfari pri Linukso kaj libera programaro"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Subteno por triaflankaj aplikaĵoj"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Interret-servilo"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Grupa programaro"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Servilo"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Fajro�irmilo/enkursigilo"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Interreta kluzo"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Po�to/Novaĵoj"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix po�ta servilo, Inn novaĵaj servilo"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Dosierujo-servilo"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Servilo"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domajn-noma kaj ret-informa servilo"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Dosier- kaj printil-kundivida servilo"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS servilo, Samba servilo"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Datumbazoj"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Datenbaz-serviloj PostgreSQL kaj MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Datenbaz-serviloj PostgreSQL kaj MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "TTT/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Po�to"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix po�ta servilo"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Datenbaz-servilo PostgreSQL aÅ­ MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Datenbaz-servilo PostgreSQL aÅ­ MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Reta computilo (servilo)"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-servilo, SMB-servilo, prokur-servilo, ssh-servilo"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafika medio"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE Laborstacio"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "La tabula medio K, la baza grafika medio kun kolekto da akompanaj iloj"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnoma Laborstacio"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Grafika medio kun uzfacila aplikaĵaro kaj tabul-iloj"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "Labortabulo IceWm"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr "Grafika medio kun uzfacila aplikaĵaro kaj tabul-iloj"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Aliaj grafikaj labortabuloj"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, ktp."
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Iloj"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH servilo"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Servilo de fora konfigurado Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Retaj utilaĵoj/monitorado"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Monitoriloj, proces-kalkuliloj, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Sorĉiloj de Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Sorĉiloj por konfiguri servilon"
@@ -691,7 +864,7 @@ msgstr ""
 "Eraro okazis, sed mi ne scias kiel trakti �in bone.\n"
 "DaÅ­ri je via propra risko."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -711,253 +884,253 @@ msgstr "Eniras pa�on `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Linuks-Mandrejka Instalado %s"
+msgid "%s Installation %s"
+msgstr "%s Instalado %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> inter elementoj"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Via sistemo havas malmulte da risurcoj.  Eble vi havos problemojn pri\n"
-"instali Linuks-Mandrejkon.  Se tio okazos, vi povos anstataÅ­ provi tekstan\n"
+"instali %s.  Se tio okazos, vi povos anstataÅ­ provi tekstan\n"
 "instaladon.  Por ĉi tio, premu `F1' kiam vi startas de KDROM, kaj sekve\n"
 "tajpu `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Instalo de la labortablo Mageia KDE"
+msgid "Media Selection"
+msgstr ""
+
+#: steps_gtk.pm:253
+#, c-format
+msgid "Install %s KDE Desktop"
+msgstr "Instalo de la labortablo %s KDE"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Instalo de la labortablo Mageia GNOME"
+msgid "Install %s GNOME Desktop"
+msgstr "Instalo de la labortablo %s GNOME"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Persona instalado"
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "Labortabulo IceWm"
+msgstr ""
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "Labortabulo IceWm"
+msgstr ""
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "Labortabulo IceWm"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Elektado de Pakaĵaj Grupoj"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Elektado de individuaj pakaĵoj"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Tuta grandeco: %d / %d MB"
+msgid "Unselect All"
+msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Malbona pakaĵo"
+msgid "Total size: %d / %d MB"
+msgstr "Tuta grandeco: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versio: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Grandeco: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Graveco: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Vi ne povas elektu/malelektu ĉi tiun pakaĵon"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "pro mankanta %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "pro neplenumita %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "mi provas disponigi %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "por konservi %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Vi ne povas elekti ĉi tiun pakaĵon ĉar ne estas sufiĉe da spaco por instali\n"
 "�in."
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "La sekvaj pakaĵoj estos instalataj"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "La sekvaj pakaĵoj estos malinstalataj"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ĉi tiu estas deviga pakaĵo, vi ne povas malelekti �in"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Vi ne povas malelekti ĉi tiun pakaĵon.  Ĝi estas jam instalita."
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Vi ne povas malelekti ĉi tiun pakaĵon.  Ĝi devus esti promociata."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Montru aŭtomate elektitajn pakaĵojn"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalu"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Åœargi/Konservi selekton"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Ĝisdatigo de pakaĵ-elekto"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimuma instalado"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Programar-mastrumilo"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Elektu la pakaĵojn kiuj vi deziras instali"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalanta"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Neniaj detaloj"
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "Tempo restanta "
+msgstr ""
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "Taksas"
+msgstr ""
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakaĵo"
 msgstr[1] "%d pakaĵoj"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Resumo"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Konfiguru"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "ne konfigurita"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Elektado de Pakaĵaj Grupoj"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -966,12 +1139,12 @@ msgstr ""
 "La sekva instal-datenportilo(j) estas trovita(j).\n"
 "Se vi deziras transsalti kelkajn de ili, vi povas tiujn nun malselekti."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Vi havas la opcion kopii la enhavojn de la KD-oj sur la fiksdiskon antaÅ­ la "
@@ -979,72 +1152,72 @@ msgstr ""
 "Tiam la instalado daŭrigas el la fiksdisko kaj la pakaĵoj restos atingeblaj "
 "post kiam la sistemo estos plene instalita."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopii kompletajn KD-ojn"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Eraro okazis"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Bonvole elektu vian klavar-aran�on"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "Jen la kompleta listo de disponeblaj klavaroj"
+msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalado/Äœisdatigo"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Ĉu tiu ĉi estas instalado aŭ �isdatigo?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalado"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Äœisdatigu %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Ĉifro�losilo por %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "Instalado"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1053,36 +1226,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Konfiguras IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Ne libera spaco por 1mb-startparto! La instalado daurigos, sed por startigi "
-"vian sistemon, vi devos krei la startpartan subdiskon en DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Vi devas krei pra�argon PPC PReP Boot! La instalado daŭros, sed por startigi "
-"vian sistemon, vi devas krei la pra�argan subdiskon en DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1097,12 +1251,12 @@ msgstr ""
 "kiam vi finos.\n"
 "Se vi ne havas �in, klaku \"Nuligu\" por eviti la instaladon de ĉi tiu KDROM."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Serĉas haveblajn pakaĵojn"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1111,7 +1265,7 @@ msgstr ""
 "Via sistemo ne havas sufiĉe da spaco libera por instalado aŭ �isdatigo (%dMB "
 "> %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1120,54 +1274,52 @@ msgstr ""
 "Bonvole elektu �argi aŭ konservi pakaĵ-elekton.\n"
 " La formato estas la sama kiel dosieroj generitaj per auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Åœargu"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Konservu"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Malbona dosiero"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "Elektado de Pakaĵaj Grupoj"
+msgstr "Grafika medio"
 
-#: steps_interactive.pm:474
-#, fuzzy, c-format
+#: steps_interactive.pm:460
+#, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
-"Vi povas elekti profilon de labortablo de via laborejo: KDE, GNOME aÅ­ "
-"Personigita"
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Elektita grandeco estas pli ampleksa ol disponebla spaco"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Instaltipo"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1176,89 +1328,113 @@ msgstr ""
 "Vi ne elektis pakaĵgrupon.\n"
 "Bonvole elektu la minimuman instaladon kiun vi deziras:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Kun X"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Instalanta pakaĵo %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Kun baza dokumentaĵo (rekomendita!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Vere minimuma instalado (precipe ne urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Preparas instaladon"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalanta pakaĵo %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Estis eraro ordigi pakaĵojn:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Ĉu vi deziras daŭri tamen?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Reprovu"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Transsalti tiun pakaĵon"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Transsalti ĉiujn pakaĵojn de la datenportilo \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Reiru al la datenportilo kaj pakaĵ-selekto"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Estis eraro dum instalado de pakaĵo %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Post-instala konfigurado"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Bonvole certi�u ke la datenportilo por �isdatigaj moduloj trovi�as en la "
 "aparato %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Äœisdatigoj"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1279,28 +1455,29 @@ msgstr ""
 "\n"
 "Ĉu vi deziras instali tiujn �isdatigojn?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s sur %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Aparataro"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Sonkarto"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Ĉu vi havas ISA-sonkarton?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1309,80 +1486,68 @@ msgstr ""
 "Rulu \"alsaconf\" aÅ­ \"sndconfig\" post instalado por konfiguri vian "
 "sonkarton"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Ne detektis sonkarto. Provu \"harddrake\" post instalado"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafika interfaco"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Reto kaj Interreto"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Prokuraj Serviloj"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "konfigurita"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "sekurnivelo"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Fajromuro (Firewall)"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktiva"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "malebligita"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Vi ne konfiguris X-on. Ĉu vi certas vere voli tion?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Preparas start�argilon"
-
-#: steps_interactive.pm:1027
-#, c-format
-msgid "Be patient, this may take a while..."
+msgid "Preparing initial startup program..."
 msgstr ""
 
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1041
 #, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
+msgid "Be patient, this may take a while..."
 msgstr ""
-"Ŝajne vi havas malnovegan aŭ nekonatan ma�inon,la yaboot-startilo ne "
-"funkcios por vi.La instalado daÅ­rigos, sed vi devosuzi BootX aÅ­ alian "
-"rimedon por startigi vian ma�inon. La kerno-argumento por la root fs "
-"[dosiersistemo] estas: root=%s"
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1391,17 +1556,17 @@ msgstr ""
 "Sur tiu ĉi sekurec-nivelo, la aliro al dosieroj en la Vindozaj subdiskoj "
 "estas limigitaj al la mastrumanto."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "En�ovu malplenan disketon en drajvo %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Kreas aÅ­toinstalan disketon"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1412,12 +1577,12 @@ msgstr ""
 "\n"
 "Ĉu vi vere volas ĉesi nun?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulojn"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Restarto"
@@ -1512,13 +1677,6 @@ msgid ""
 "Users"
 msgstr "Uzuloj"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Retumado"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1560,88 +1718,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Eliro"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Oficej-programoj: tekstiloj (Verkilo [kword], aboword), tabelkalkuliloj "
-#~ "(kspread, gnumeric), pdf-vidigiloj, ktp."
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Mi de�utas dosieron %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr "Äœisdatigo de 32-bita al 64-bita eldono ne estas subtenata"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr "Äœisdatigo de 64-bita al 32-bita eldono ne estas subtenata"
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Vi selektis jena(j)n servilo(j)n: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Tiuj serviloj estas en�altitaj defaŭlte. Ili havas neniujn konatajn "
-#~ "sekurec-\n"
-#~ "problemojn, sed iuj novaj povas esti trovita. Tiukaze, vi devas certi�i "
-#~ "por\n"
-#~ "�isdatigi kiom eble plej baldaŭ.\n"
-#~ "\n"
-#~ "\n"
-#~ "Ĉu vi vere deziras instali tiujn servilojn?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "Labortablo IceWm"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "Kontaktu la spegulon por havigi la liston de havebla pakaĵoj"
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Ne povis kontakti spegulon %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Kreu aÅ­toinstalan disketon"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "La meminstalo povas esti plene aÅ­tomatigita se vi deziras,\n"
-#~ "tiukaze �i transprenas la fiksdiskon!!\n"
-#~ "(tio estas farita por instali sur alian aparaton).\n"
-#~ "\n"
-#~ "Vi eble preferas ripeti la instaladon.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Reludu"
-
-#~ msgid "Automated"
-#~ msgstr "AÅ­tomata"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Konservu la pakaĵ-elekton"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Ĉu vi deziras uzi aboot-on?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Eraro daÅ­re mi instalis \"aboot\",\n"
-#~ "Ĉu mi devus provi perforte instali eĉ se tio detruas la unuan subdiskon?"
diff --git a/perl-install/install/share/po/es.po b/perl-install/install/share/po/es.po
index 9dfd1f26b..42615c53c 100644
--- a/perl-install/install/share/po/es.po
+++ b/perl-install/install/share/po/es.po
@@ -1,60 +1,83 @@
-# translation of es.po to Español
-# traducción de DrakX-es.po to Español
-# spanish translation of DrakX
-# Copyright (C) 2000, 2001,2002, 2007 Mandriva S.A.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Fabián Mandelbaum <fmandelbaum@gmail.com>, 2000-2004, 2007.
-# Pablo Saratxaga <pablo@mandriva.com>, 2004, 2006.
-# Jaime Crespo <505201@unizar.es>, 2004, 2005.
-# José Manuel Pérez <jmprodu@hotmail.com>, 2005.
-# Andre Paulo Machado <andre.panm@gmail.com>, 2009.
+# Translators:
+# motitos, 2013,2015
+# Egoitz Rodriguez Obieta <egoitzro@gmail.com>, 2014-2015
+# Miguel Ortega, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: es\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2010-03-24 15:12-0300\n"
-"Last-Translator: Diego Bello <dbello@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-31 16:10+0000\n"
+"Last-Translator: motitos\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/"
+"es/)\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Su escritorio en un pendrive USB"
+msgid "Join Us!"
+msgstr "¡Únasenos!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "La distribución Mageia Linux 100%% Código Abierto"
+msgid "Make it yours!"
+msgstr "¡Personalícela!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Explore Linux con facilidad por medio de Mageia One"
+msgid "Your choice!"
+msgstr "¡Su elección!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Un escritorio Mageia Linux completo, con soporte"
+msgid "Office tools"
+msgstr "Herramientas de oficina"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: distribuciones para las necesidades de todos"
+msgid "Home entertainment"
+msgstr "Entretenimiento de hogar"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Para niños"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "¡Para la familia!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "¡Para desarrolladores!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "¡Gracias!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "¡Sea libre!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr "¿Tiene algún soporte de instalación suplementario?"
+msgstr "¿Tiene usted otros medios complementarios?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -62,124 +85,197 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
-"Se encontraron los soportes siguientes y se usarán durante la instalación: "
-"%s.\n"
+"Se han encontrado los siguientes medios y serán utilizados durante la "
+"instalación: %s.\n"
 "\n"
 "\n"
-"¿Tiene algún soporte suplementario que configurar?"
+"¿Tiene otro medio de instalación complementario que configurar?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Red (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Red (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Red (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
-msgstr "¿URL del sitio réplica?"
+msgstr "¿Cuál es la URL del servidor espejo?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
-msgstr "El URL debe empezar con ftp:// o http://"
+msgstr "La URL debe comenzar con ftp:// o http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Contactando con el sitio web de Mageia Linux para obtener la lista de las "
-"réplicas disponibles"
+"Contactando al sitio web %s para obtener la lista de servidores espejo "
+"disponibles..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"No se pudo conectar con el sitio web de Mageia Linux para obtener la lista "
-"de las réplicas disponibles"
+"No se ha podido contactar con el sitio web %s para obtener la lista de "
+"espejos disponibles"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
-msgstr "Elija un sitio de réplica del cual obtener los paquetes"
+msgstr "Elija un servidor espejo desde el cual obtener los paquetes"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Configuración NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
-msgstr "Ingrese el nombre de servidor y el directorio de su soporte NFS"
+msgstr "Por favor, introduzca el nombre de equipo y directorio de su medio NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
-msgstr "Falta el nombre del servidor"
+msgstr "Falta nombre de equipo"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
-msgstr "El directorio debe empezar con \"/\""
+msgstr "El directorio debe comenzar con \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
-msgstr "¿Nombre del servidor del montaje NFS?"
+msgstr "¿Cuál es el nombre de equipo del montaje NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Directorio"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
-msgstr "Suplementario"
+msgstr "Complementario"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
-"No puedo encontrar el archivo hdlist en este sitio réplica. Asegúrese que la "
-"ubicación es correcta."
+"No se puede encontrar un archivo de lista de paquetes en este espejo. "
+"Asegúrese de que la ubicación sea la correcta."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Versión Core"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Versión Tainted"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Versión Nonfree"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Hardware de su máquina necesita de firmware no libre para que los "
+"controladores de software libre funcionen."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Debería habilitar \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" contiene varias piezas de los sistemas y sus aplicaciones"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" contiene software no libre.\n"
+
+#: any.pm:477
+#, 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 ""
+"También contiene firmware necesario para ciertos dispositivos puedan operar "
+"(ej: algunas tarjetas gráficas ATI/AMD, algunas tarjetas de red, algunas "
+"tarjetas RAID, etc)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" contiene software que no puede ser distribuido en todos los países "
+"debido a patentes de software."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"También contiene software de \"%s\" reconstruido con capacidades adicionales."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Aquí puede habilitar mas medios si así lo desea."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Este medio provee actualizaciones de paquetes para el medio \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Buscando paquetes ya instalados..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Encontrando los paquetes a actualizar..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
-msgstr "Quitando paquetes antes de actualizar..."
+msgstr "Eliminación de los paquetes antes de la actualización..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -187,97 +283,97 @@ msgid ""
 "\n"
 "Do you really want to remove these packages?\n"
 msgstr ""
-"Se quitarán los paquetes siguientes para permitir actualizar su sistema: %s\n"
+"Los siguientes paquetes serán removidos para permitir la actualización de su "
+"sistema: %s\n"
 "\n"
 "\n"
-"¿Realmente desea quitar estos paquetes?\n"
+"¿Está seguro de que quiere eliminar estos paquetes?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Error al leer el archivo %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "Se renombraron los discos siguientes:"
+msgstr "El o los siguientes discos fueron renombrados:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (antes conocido como %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Red"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
-msgstr "Por favor, elija un soporte"
+msgstr "Por favor, elija un medio"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "El archivo ya existe. ¿Desea sobreescribirlo?"
+msgstr "El archivo ya existe. ¿Sobrescribirlo?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
-msgstr "Nombre NFS incorrecto"
+msgstr "Nombre NFS erróneo"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
-msgstr "Soporte %s incorrecto"
+msgstr "Medio %s erróneo"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
-msgstr "No se pueden realizar instantáneas de pantalla antes del particionado"
+msgstr "No se puede hacer capturas de pantalla antes de particionar"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
-"Luego de la instalación estarán disponibles las instantáneas de pantalla en "
-"%s"
+"Capturas de pantallas estarán disponiblen después de la instalación en %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalación"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configuración"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
-msgstr "También se debe formatear %s"
+msgstr "También deben formatear %s"
 
 #: interactive.pm:16
 #, c-format
@@ -285,9 +381,9 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"Algún hardware de su computadora necesita controladores \"propietarios\" "
-"para funcionar.\n"
-"Puede encontrar información sobre ellos en: %s"
+"Algún hardware de su equipo necesita controladores ``propietarios\" para "
+"trabajar.\n"
+"Puede encontrar más información sobre ellos en: %s"
 
 #: interactive.pm:22
 #, c-format
@@ -299,22 +395,22 @@ msgstr "Levantando la red"
 msgid "Bringing down the network"
 msgstr "Bajando la red"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Por favor espere, recuperando archivo"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr "no se puede añadir media"
+msgstr "no se puede agregar medio"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
-msgstr "Copiando algunos paquetes en el disco para uso futuro"
+msgstr "Copiar algunos paquetes en disco para su uso futuro"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Copia en curso"
@@ -322,7 +418,7 @@ msgstr "Copia en curso"
 #: pkgs.pm:32
 #, c-format
 msgid "must have"
-msgstr "necesario"
+msgstr "debe tener"
 
 #: pkgs.pm:33
 #, c-format
@@ -332,364 +428,451 @@ msgstr "importante"
 #: pkgs.pm:34
 #, c-format
 msgid "very nice"
-msgstr "muy bueno"
+msgstr "muy agradable"
 
 #: pkgs.pm:35
 #, c-format
 msgid "nice"
-msgstr "bueno"
+msgstr "agradable"
 
 #: pkgs.pm:36
 #, c-format
 msgid "maybe"
-msgstr "quizás"
+msgstr "tal vez"
+
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Obteniendo información de paquete de meta datos XML..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"No hay información xml para el medio \"%s\", sólo un resultado parcial para "
+"el paquete %s"
 
-#: pkgs.pm:239
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Sin descripción"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
-"Algunos paquetes que necesita %s no se pueden instalar:\n"
+"Algunos paquetes requeridos por %s no se pueden instalar:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
-msgstr "Ocurrió un error:"
+msgstr "Se produjo un error:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Ocurrió un error fatal: %s"
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "No preguntar de nuevo"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
-msgstr "Fallaron %d transacciones de instalación"
+msgstr "Fallaron %d operaciones de instalación"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
-msgstr "La instalación de paquetes falló:"
+msgstr "Falló la instalación de paquetes:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
-msgstr "Estación de trabajo de Oficina"
+msgstr "Estación de trabajo de oficina"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programas de Oficina: procesadores de texto (OpenOffice.org Writer, Kword), "
-"hojas de cálculo (OpenOffice.org Calc, Kspread), visualizadores PDF, etc"
+"Programas de oficina: procesadores de texto (LibreOffice Writer, Kword), "
+"hojas de cálculo (LibreOffice Calc, Kspread), visores PDF, etc."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
-msgstr "Estación de Juegos"
+msgstr "Estación de juegos"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programas de entretenimiento: arcade, tableros, estrategia, etc"
+msgstr "Programas de diversión: arcade, tableros, estrategia, etc."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
-msgstr "Estación Multimedios"
+msgstr "Estación Multimedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
-msgstr "Programas de reproducción/edición de sonido y vídeo"
+msgstr "Programas de reproducción y edición de sonido y video"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
-msgstr "Estación Internet"
+msgstr "Estación de Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
-"Conjunto de herramientas para leer y enviar correo y noticias (mutt, tin...) "
-"y para navegar por la Web"
+"Conjunto de herramientas para leer y enviar correo y noticias (mutt, tin, "
+"etc) y para navegar por la Web"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
-msgstr "Computadora de Red (cliente)"
+msgstr "Computador de red (cliente)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
-msgstr "Clientes para los distintos protocolos incluyendo a SSH"
+msgstr "Clientes para diferentes protocolos, incluyendo ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
-msgstr "Herramientas para facilitar la configuración de su computadora"
+msgstr "Herramientas para facilitar la configuración de su computador"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
-msgstr "Herramientas para la consola"
+msgstr "Herramientas de consola"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, shells, manipulación de archivos, terminales"
+msgstr "Editores, consolas, herramientas de archivo, terminales"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Desarrollo"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
-msgstr "Bibliotecas de desarrollo C y C++, programas y archivos *.h"
+msgstr "Bibliotecas de C y C + +, programas y archivos de inclusión"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentación"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libros y COMOs sobre Linux y Software Libre"
+msgstr "Libros y Howtos sobre Linux y Software Libre"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Soporte de aplicaciones de terceros"
+msgstr "Base estándar de Linux. Soporte de aplicaciones de terceros"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
-msgstr "Servidor web"
+msgstr "Servidor Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
-msgstr "Grupos de trabajo"
+msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Servidor Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
-msgstr "Cortafuegos/Router"
+msgstr "Cortafuegos/Enrutador"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
-msgstr "Pasarela de acceso a Internet"
+msgstr "Puerta de enlace de Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Correo/Noticias"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Servidor de correo Postfix, servidor de noticias Inn"
+msgstr "Servidor de correo Postfix, Servidor de noticias Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
-msgstr "Servidor de directorios"
+msgstr "Servidor de directorio"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
-msgstr "Servidor de nombres de dominio y servidor de información de red"
+msgstr "Nombre de dominio y Servidor de Información de Red"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Servidor de archivos e impresión"
+msgstr "Servidor de compartición de archivos e impresoras"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Servidor NFS, servidor Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
-msgstr "Base de Datos"
+msgstr "Bases de datos"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Servidor de base de datos PostgreSQL y MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Servidor de bases de datos PostgreSQL y MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
-msgstr "Apache y Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Correo"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Servidor de correo Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de base de datos PostgreSQL o MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Servidor de bases de datos PostgreSQL o MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
-msgstr "Servidor de red"
+msgstr "Servidor de computador de red"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, servidor SMB, servidor proxy, servidor SSH"
+msgstr "servidor NFS, servidor SMB, servidor proxy, servidor ssh"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Entorno gráfico"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Estación de trabajo KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
-"El K Desktop Environment, el entorno gráfico básico con una colección de "
+"El entorno de escritorio K, el entorno gráfico básico con una colección de "
 "herramientas que lo acompañan"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Estación de trabajo GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
-"Entorno gráfico con un conjunto de herramientas de escritorio y aplicaciones "
-"amigables"
+"Un entorno gráfico con un conjunto de aplicaciones y herramientas de "
+"escritorio amigables con el usuario"
+
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Estación de trabajo XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Un entorno gráfico ligero con un conjunto de aplicaciones y herramientas de "
+"escritorio amigables con el usuario"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Estación de trabajo MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Estación de trabajo Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Un entorno gráfico basado en GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Escritorio LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Un puerto QT de siguiente generación del entorno de escritorio ligero"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Escritorio Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Un entorno gráfico rápido y liviando con un seguimiento dedicado"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Escritorio LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Un entorno gráfico ligero"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Escritorio Plasma"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Un entorno gráfico ligero y rápido con un conjunto de herramientas de "
-"escritorio y aplicaciones amigables"
+"El escritorio Plasma, el entorno gráfico básico, acompañado con una "
+"colección de herramientas"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
-msgstr "Otros entornos gráficos"
+msgstr "Otros escritorios gráficos"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilidades"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Servidor SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Servidor de configuración remota Webmin"
+msgstr "Servidor de Configuración Remota Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Utilidades/Supervisión de red"
+msgstr "Utilidades y monitoreo de red"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
-msgstr "Herramientas de supervisión, control de procesos, tcpdump, nmap, ..."
+msgstr ""
+"Herramientas de supervisión, contabilidad de procesos, tcpdump, nmap, etc."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Asistentes de Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Asistentes para configurar el servidor"
@@ -700,10 +883,10 @@ msgid ""
 "An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"Ocurrió un error y no se puede resolver de forma adecuada.\n"
+"Se produjo un error, pero no sé cómo manejarlo bien.\n"
 "Continúe bajo su propio riesgo."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -712,350 +895,354 @@ msgid ""
 "\"\n"
 msgstr ""
 "Algunos paquetes importantes no se instalaron correctamente.\n"
-"Puede ser que su lector de CD o su CD de instalación estén defectuosos.\n"
-"Verifique el CD de instalación en un sistema ya existente con el comando:\n"
-"  rpm -qpl media/main/*.rpm\n"
+"Puede ser que su unidad de CD-ROM o su disco CD-ROM está defectuoso.\n"
+"Verifica el disco CD-ROM en un equipo instalado con \"rpm -qpl media/main/*."
+"rpm\"\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
 msgid "Entering step `%s'\n"
-msgstr "Entrando en la etapa '%s'\n"
+msgstr "Entrando al paso `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Instalación de Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "%s Instalación %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
-msgstr "<Tab>/<Alt-Tab> entre elementos"
+msgstr "<Tab>/<Alt-Tab> entre los elementos"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
-msgstr "El servidor Xorg tarda en iniciar. Por favor, espere..."
+msgstr "El servidor Xorg demora en iniciar. Por favor espere..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Su sistema tiene pocos recursos. Puede tener algún problema instalando\n"
-"Mageia Linux. De ser así, puede intentar una instalación tipo texto.\n"
-"Para ello, presione 'F1' cuando arranque desde el CDROM, e introduzca 'text'."
+"El sistema está bajo en recursos. Es posible que tenga algún problema "
+"instalando\n"
+"%s. Si eso ocurre, puede tratar de una instalación en modo texto. Para "
+"ello,\n"
+"presione 'F1' cuando arranque desde el CD-ROM, luego escriba `texto'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Instalar el escritorio KDE de Mageia"
+msgid "Media Selection"
+msgstr "Selección de medios"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Instalar el escritorio GNOME de Mageia"
+msgid "Install %s KDE Desktop"
+msgstr "Instalar escritorio KDE %s"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Instalar escritorio GNOME %s"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Instalación personalizada"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Escritorio KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Escritorio GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Escritorio personalizado"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
-msgstr "Aquí tiene un previsualización del escritorio '%s'."
+msgstr "Aquí hay una vista previa del escritorio '%s'."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
-msgstr "Haga clic sobre las imágenes para agrandarlas"
+msgstr "Haga clic en las imágenes para ver una vista previa más grande"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
-msgstr "Selección de grupos de paquetes"
+msgstr "Selección de Grupo de paquetes"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
-msgstr "Selección de paquetes individuales"
+msgstr "Selección individual de paquetes"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Tamaño total: %d / %d MB"
+msgid "Unselect All"
+msgstr "Deseleccionar todas."
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Paquete incorrecto"
+msgid "Total size: %d / %d MB"
+msgstr "Tamaño total: %d/%d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versión: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Tamaño: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Importancia: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
-msgstr "No puede seleccionar/deseleccionar este paquete"
+msgid "You cannot select/unselect this package"
+msgstr "No se puede seleccionar/des-seleccionar de este paquete"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "debido a que falta %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "debido a que no se satisfizo %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
-msgstr "intentando promover a %s"
+msgstr "tratando de promover %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "para mantener %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
-"No puede seleccionar este paquete porque no hay espacio suficiente para "
+"No se puede seleccionar el paquete ya que no hay suficiente espacio para "
 "instalarlo"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
-msgstr "Se van a instalar los paquetes siguientes"
+msgstr "Los siguientes paquetes se van a instalar"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
-msgstr "Se van a quitar los paquetes siguientes"
+msgstr "Los siguientes paquetes se van a quitar"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
-msgstr "Este es un paquete obligatorio, no puede desmarcarlo"
+msgid "This is a mandatory package, it cannot be unselected"
+msgstr "Este es un paquete obligatorio, no puede ser des-seleccionado"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
-msgstr "No puede desmarcar este paquete. Ya está instalado"
+msgid "You cannot unselect this package. It is already installed"
+msgstr "No se puede des-seleccionar este paquete. Ya está instalado"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
-msgstr "No puede desmarcar este paquete. Debe ser actualizado"
+msgid "You cannot unselect this package. It must be upgraded"
+msgstr "No se puede des-seleccionar este paquete. Debe ser actualizado"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Mostrar los paquetes seleccionados automáticamente"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalar"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Cargar/Guardar selección"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Actualizando la selección de paquetes"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Instalación mínima"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
-msgstr "Administración de software"
+msgstr "Administración de Software"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
-msgstr "Elija los paquetes que desea instalar"
+msgstr "Seleccione los paquetes que desea instalar"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalando"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Sin detalles"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Tiempo restante:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
-msgstr "(estimando...)"
+msgstr "(Estimando...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d paquete"
 msgstr[1] "%d paquetes"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Resumen"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configurar"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "no configurado"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Selección de soportes"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
-"Se han encontrado los siguientes soportes de instalación.\n"
-"Si quiere saltarse alguno de ellos, puede deseleccionarlos ahora."
+"Se han encontrado los siguientes medios de instalación.\n"
+"Si desea omitir algunos de ellos, puede desseleccionar algunos ahora."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
-"Tiene la opción de copiar los contenidos de los CD al disco duro antes de la "
-"instalación.\n"
-"La misma continuará desde el disco duro y los paquetes estarán disponibles "
-"una vez que el sistema esté completamente instalado."
+"Usted tiene la opción de copiar el contenido de los CDs a la unidad de disco "
+"duro antes de la instalación.\n"
+"Se continuará desde la unidad de disco duro y los paquetes estarán "
+"disponibles una vez que el sistema esté completamente instalado."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
-msgstr "Copiar los CD por completo"
+msgstr "Copiar todos los CDs"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
-msgstr "Ocurrió un error"
+msgstr "Se produjo un error"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
-msgstr "Por favor, elija el tipo de su teclado"
+msgstr "Por favor, elija la distribución del teclado"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "Aquí tiene la lista completa de teclados disponibles:"
+msgstr "Aquí está la lista completa de los teclados disponibles:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
-msgstr "Instalación/Actualización"
+msgstr "Instalar/Actualizar"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "¿Es una instalación o una actualización?"
+msgstr "¿Es esta una instalación o una actualización?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
-msgstr "Instalación"
+msgstr ""
+"_: Este es un sustantivo:\n"
+"Instalación"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Actualizar %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
-msgstr "Clave de cifrado para %s"
+msgstr "Llave de cifrado para %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
-msgstr "Cancelar la instalación, volver a iniciar el sistema"
+msgstr "Cancele la instalación, reinicie el sistema"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
-msgstr "Instalación nueva"
+msgstr "Nueva instalación"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
-msgstr "Actualizar la instalación previa (no se recomienda)"
+msgstr "Actualizar instalación previa (no recomendado)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1063,45 +1250,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"El instalador detectó que no se puede actualizar con seguridad a su\n"
-"sistema Mageia Linux ya instalado a la versión %s.\n"
+"Instalador ha detectado que su sistema Linux instalado no\n"
+"puede ser actualizado de manera segura a %s.\n"
 "\n"
-"Se recomienda una instalación nueva que reemplace a la anterior.\n"
+"Se recomienda una instalación nueva que sustituya a la anterior.\n"
 "\n"
-"¡Atención: debería hacer copia de respaldo de todos sus datos\n"
-"antes de comenzar con la instalación nueva!"
+"Advertencia: debe hacer un respaldo de todos sus datos personales\n"
+"antes de elegir \"Nueva instalación\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
-msgstr "Configurando dispositivos IDE"
+msgstr "Configurando IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"¡No hay 1MB de espacio para bootstrap! La instalación continuará, pero para "
-"arrancar su sistema, necesitará crear la partición bootstrap en DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"¡Necesita crear un bootstrap de arranque PReP PPC! La instalación continuará "
-"pero, para arrancar su sistema, necesitará crear la partición bootstrap en "
-"DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1109,173 +1276,199 @@ msgid ""
 "done.\n"
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
-"¡Cambie su CD-ROM!\n"
-"\n"
-"Por favor, inserte CD-ROM etiquetado \"%s\" en la unidad y pulse Aceptar "
-"cuando lo haya hecho.\n"
-"Si no lo posee, pulse Cancelar para evitar la instalación desde este CD-ROM."
+"¡Cambiar su CD-ROM!\n"
+"Por favor inserte el CD-ROM con la etiqueta \"%s\" en la unidad y pulse "
+"Aceptar cuando haya terminado.\n"
+"Si no lo tiene, pulse Cancelar para evitar la instalación desde este CD-Rom."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
-msgstr "Buscando los paquetes disponibles..."
+msgstr "Buscando paquetes disponibles ..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
-"Su sistema no tiene espacio libre suficiente para la instalación o "
-"actualización (%d MB > %d MB)"
+"Su sistema no dispone de espacio suficiente para la instalación o "
+"actualización (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"Por favor, seleccione cargar o guardar la selección de paquetes.\n"
-"El formato es el mismo que el de los archivos generados con la instación "
-"automática."
+"Por favor, elija cargar o guardar la selección de paquetes.\n"
+"El formato es el mismo que los archivos generados por auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Cargar"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Guardar"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Archivo incorrecto"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
-msgstr "Selección del entorno de escritorio"
+msgstr "Selección de escritorio"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
-msgstr "Puede elegir un perfil de escritorio de estación de trabajo."
+msgstr "Usted puede elegir su perfil de escritorio de estación de trabajo."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
-msgstr "El tamaño seleccionado es mayor que el disponible"
+msgstr "El tamaño seleccionado es más grande que el espacio disponible"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
-msgstr "Tipo de instalación."
+msgstr "Tipo de instalación"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
-"No ha seleccionado ningún grupo de paquetes\n"
-"Elija por favor la instalación mínima que desea."
+"No ha seleccionado ningún grupo de paquetes.\n"
+"Por favor, elija la instalación mínima que desee:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Con X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Instalar paquetes sugeridos"
+msgid "Install recommended packages"
+msgstr "Intala paquetes recomendados"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
-msgstr "Con documentación básica (¡recomendado!)"
+msgstr "Con la documentación básica (¡recomendado!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
-msgstr "Instalación mínima \"en serio\" (especialmente sin urpmi)"
+msgstr "Instalación realmente mínima (especialmente sin urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Preparando actualización..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Preparando la instalación"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalando el paquete %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
-msgstr "Hubo un error al ordenar los paquetes:"
+msgstr "Se ha producido un error al ordenar los paquetes:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
-msgstr "¿Seguir adelante?"
+msgstr "¿Continuar de todos modos?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
-msgstr "Reintentarlo"
+msgstr "Reintentar"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
-msgstr "Omitir este paquete"
+msgstr "Saltar este paquete"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
-msgstr "Omitir todos los paquetes del soporte \"%s\""
+msgstr "Omitir todos los paquetes del medio \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
-msgstr "Volver a la selección de paquetes"
+msgstr "Vuelve a la selección de medios y paquetes"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
-msgstr "Hubo un error al instalar el paquete %s."
+msgstr "Se ha producido un error al instalar el paquete %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
-msgstr "Configuración posterior a la instalación"
+msgstr "Configuración post-instalación"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
-"Por favor, asegúrese de que el soporte de actualización de módulos está en "
-"la unidad %s"
+"Por favor, asegúrese de que el medio de Módulos de Actualización está en la "
+"unidad %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Actualizaciones"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Ahora tiene la oportunidad de configurar los repositorios en internet."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Esto permite instalar actualizaciones de seguridad."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Para configurar estos repositorios, necesitará una conexión a internet que "
+"funcione.\n"
+"\n"
+"¿Desea configurar los repositorios de actualizaciones?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1287,156 +1480,146 @@ msgid ""
 "\n"
 "Do you want to install the updates?"
 msgstr ""
-"Ahora tiene la oportunidad de bajar paquetes actualizados. Estos paquetes\n"
-"se han actualizado después de que se publicó la distribución. Puede que los\n"
-"mismos contengan correcciones de bugs o de seguridad.\n"
+"Ahora tiene la oportunidad de descargar paquetes actualizados. Estos "
+"paquetes\n"
+"se han actualizado después de la distribución fue lanzada. Pueden contener\n"
+"correcciones de seguridad o de errores.\n"
 "\n"
-"Para descargar estos paquetes, necesitará tener una conexión con la\n"
-"Internet que esté funcionando.\n"
+"Para descargar estos paquetes, se necesita tener una conexión a Internet "
+"activa.\n"
 "\n"
 "¿Desea instalar las actualizaciones?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s en %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Tarjeta de sonido"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "¿Tiene una tarjeta de sonido ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
-"Use \"alsaconf\" o \"sndconfig\" luego de la instalación para configurar su "
-"tarjeta de sonido"
+"Ejecute \"alsaconf\" o \"sndconfig\" después de la instalación para "
+"configurar la tarjeta de sonido"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
-"No se detectó tarjeta de sonido. Pruebe \"harddrake\" luego de la instalación"
+"No se detectó tarjeta de sonido. Trate \"HardDrake\" después de la "
+"instalación"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfaz gráfica"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Redes e Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
-msgstr "Proxis"
+msgstr "Servidores proxy"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "configurado"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Nivel de seguridad"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Cortafuegos"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "activado"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
-msgstr "No ha configurado a X ¿Está seguro que realmente desea esto?"
+msgstr "No se ha configurado X. ¿Está seguro de que desea esto?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Preparando el cargador de arranque"
+msgid "Preparing initial startup program..."
+msgstr "Preparando el programa de instalación inicial..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
-msgstr "Sea paciente por favor, pues esto puede tardar un rato."
+msgstr "Sea paciente, esto puede tardar un tiempo..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Parece que tiene una máquina desconocida o \"Old World\", el gestor de "
-"arranque yaboot no funcionará en la misma.\n"
-"La instalación continuará, pero necesitará\n"
-"utilizar BootX o alguna otra manera para arrancar su máquina. El parámetro "
-"del kernel para el sistema de archvivos raíz es: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
-"En este nivel de seguridad, el acceso a los archivos en la partición Windows "
-"está restringido sólo al administrador."
+"En este nivel de seguridad, el acceso a los archivos en la partición de "
+"Windows está restringido al administrador."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Inserte un disquete en blanco en la unidad %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
-msgstr "Creando el disquete de instalación automática"
+msgstr "Creando disquete de instalación automática..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
-"Algunas de las etapas no fueron completadas.\n"
+"Algunas pasos no se han completado.\n"
 "\n"
-"¿Realmente desea salir ahora?"
+"¿Está seguro que desea salir ahora?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
-msgstr "Felicidades"
+msgstr "Felicitaciones"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Reiniciar"
@@ -1447,7 +1630,9 @@ msgstr "Reiniciar"
 msgid ""
 "_: Keep these entry short\n"
 "Language"
-msgstr "Idioma"
+msgstr ""
+"_: Keep these entry short\n"
+"Idioma"
 
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
@@ -1459,235 +1644,150 @@ msgstr "Localización"
 msgid ""
 "_: Keep these entry short\n"
 "License"
-msgstr "Licencia"
+msgstr ""
+"_: Keep these entry short\n"
+"Licencia"
 
 #: steps_list.pm:18
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Mouse"
-msgstr "Ratón"
+msgstr ""
+"_: Keep these entry short\n"
+"Ratón"
 
 #: steps_list.pm:19 steps_list.pm:20
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
-msgstr "Detección del disco rígido"
+msgstr ""
+"_: Keep these entry short\n"
+"Detección de disco duro"
 
 #: steps_list.pm:21 steps_list.pm:22
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Installation class"
-msgstr "Clase de instalación"
+msgstr ""
+"_: Keep these entry short\n"
+"Clase de instalación"
 
 #: steps_list.pm:23
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Keyboard"
-msgstr "Teclado"
+msgstr ""
+"_: Keep these entry short\n"
+"Teclado"
 
 #: steps_list.pm:24
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Security"
-msgstr "Seguridad"
+msgstr ""
+"_: Keep these entry short\n"
+"Seguridad"
 
 #: steps_list.pm:25
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Partitioning"
-msgstr "Particionado"
+msgstr ""
+"_: Keep these entry short\n"
+"Particionamiento"
 
 #: steps_list.pm:27 steps_list.pm:28
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Formatting"
-msgstr "Formateo"
+msgstr ""
+"_: Keep these entry short\n"
+"Formateo"
 
 #: steps_list.pm:29
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Choosing packages"
-msgstr "Selección de paquetes"
+msgstr ""
+"_: Keep these entry short\n"
+"Selección de paquetes"
 
 #: steps_list.pm:31
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Installing"
-msgstr "Instalación"
+msgstr ""
+"_: Keep these entry short\n"
+"Instalación"
 
 #: steps_list.pm:34
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Users"
-msgstr "Usuarios"
-
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
+msgstr ""
 "_: Keep these entry short\n"
-"Networking"
-msgstr "Red"
+"Usuarios"
 
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Bootloader"
-msgstr "Arranque"
+msgstr ""
+"_: Keep these entry short\n"
+"Cargador de arranque"
 
 #: steps_list.pm:40 steps_list.pm:41
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Configure X"
-msgstr "Configuración de X"
+msgstr ""
+"_: Keep these entry short\n"
+"Configurar X"
 
 #: steps_list.pm:42
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Summary"
-msgstr "Resumen"
+msgstr ""
+"_: Keep these entry short\n"
+"Resumen"
 
 #: steps_list.pm:44 steps_list.pm:45
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Services"
-msgstr "Servicios"
+msgstr ""
+"_: Keep these entry short\n"
+"Servicios"
 
 #: steps_list.pm:46
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Updates"
-msgstr "Actualizaciones"
+msgstr ""
+"_: Keep these entry short\n"
+"Actualizaciones"
 
 #: steps_list.pm:48
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Exit"
-msgstr "Salir"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programas de Oficina: procesadores de palabras (kword, abiword), "
-#~ "plantillas de cálculo (kspread, gnumeric), visualizadores PDF, etc"
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Decidió actualizar su sistema a %s. Se detectó que Ud. tiene KDE 3.5\n"
-#~ "en su sistema. El instalador no puede preservar KDE 3.5 al actualizar.\n"
-#~ "Si Ud. decide continuar, KDE 4 reemplazará a KDE 3, y perderá la\n"
-#~ "configuración personalizada de KDE. \n"
-#~ "Para actualizar con KDE 3.5 y preservar su configuración, por favor\n"
-#~ "vuelva a iniciar su sistema y actualize utilizando el applet Mandriva "
-#~ "Update."
-
-#~ msgid "Proceed"
-#~ msgstr "Continuar"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "La recuperación de [%s] falló"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Descargando el archivo %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr ""
-#~ "No se soporta la acutalización de una distribución 32 bit a una 64 bit"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr ""
-#~ "No se soporta la actualización de una distribución 64 bit a una 32 bit"
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Ha seleccionado los siguientes servidores: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Estos servidores se activan por defecto. No se les conocen problemas de\n"
-#~ "seguridad, pero se pueden encontrar problemas nuevos. En ese caso, debe "
-#~ "asegurarse de\n"
-#~ "actualizarlos tan pronto como sea posible.\n"
-#~ "\n"
-#~ "\n"
-#~ "¿Realmente desea instalar estos servidores?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "Escritorio IceWm"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr ""
-#~ "Contactando con el sitio de réplica para obtener la lista de los paquetes "
-#~ "disponibles..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "No se puede contactar al sitio de réplica %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Generar un disquete de instalación automática"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "La instalación automática puede automatizarse por completo si lo desea,\n"
-#~ "¡¡en ese caso se adueñará del disco rígido!!\n"
-#~ "(la intención de esto es instalarlo en otro ordenador).\n"
-#~ "\n"
-#~ "Puede preferir reproducir la instalación.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Reproducir"
-
-#~ msgid "Automated"
-#~ msgstr "Automatizada"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Guardar la selección de paquetes"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "¿Desea usar aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Ocurrió un error al instalar aboot, \n"
-#~ "¿desea forzar la instalación incluso si ello implicara la destrucción de "
-#~ "la primera partición?"
+msgstr ""
+"_: Keep these entry short\n"
+"Salida"
diff --git a/perl-install/install/share/po/et.po b/perl-install/install/share/po/et.po
index 404dfd489..7f9a35c57 100644
--- a/perl-install/install/share/po/et.po
+++ b/perl-install/install/share/po/et.po
@@ -1,55 +1,81 @@
 # Translation of DrakX.po to Estonian.
 # Copyright (C) 2003 Free Software Foundation, Inc.
+#
 # Riho Kurg <rx@linux.ee>, 1999-2003.
 # Marek Laane <bald@starman.ee>, 2002-2009.
-#
+# Marek Laane <bald@smail.ee>, 2011-2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-et\n"
+"Project-Id-Version: drakx_install\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-09-14 16:59+0200\n"
-"Last-Translator: Marek Laane <bald@starman.ee>\n"
-"Language-Team: Estonian <et@li.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 19:11+0300\n"
+"Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
+"Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr "Ãœhinege meiega!"
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr "Võtke see omaks!"
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr "Teie valik!"
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, c-format
+msgid "Office tools"
+msgstr "Kontoritöö vahendid"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr "Kodune meelelahutus"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Kogu töölaud USB-pulgal"
+msgid "For kids"
+msgstr "Lastele"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "100%% vaba tarkvaraga Mageia Linuxi distributsioon"
+msgid "For family!"
+msgstr "Perele!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Linuxi hõlpus tundmaõppimine Mageia One abil"
+msgid "For developers!"
+msgstr "Arendajatele!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Täielik Mageia Linuxi töölaud koos kasutajatoega"
+msgid "Thank you!"
+msgstr "Täname Teid!"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: distributsioone igale maitsele ja kõigiks vajadusteks"
+msgid "Be Free!"
+msgstr "Tundke end vabalt!"
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Kas Teil on veel paigaldusandmekandjaid?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -62,92 +88,90 @@ msgstr ""
 "\n"
 "Kas Teil on veel paigaldusandmekandjaid?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Võrk (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Võrk (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Võrk (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Peegli URL?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL-i alguses peab seisma ftp:// või http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Mageia Linuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
+"Ühendumine %s veebileheküljega saadaolevate peeglite nimekirja hankimiseks..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Ãœhenduse loomine Mageia Linuxi veebisaidiga saadaolevate peeglite nimekirja "
-"hankimiseks nurjus"
+"Ühendumine %s veebileheküljega saadaolevate peeglite nimekirja hankimiseks "
+"nurjus"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valige peegel, millelt lugeda pakettide nimekiri"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-i seadistamine"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Palun andke NFS-andmekandja masinanimi ja kataloog"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Masinanimi puudub"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Kataloogi alguses peab olema \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS-i andmekandja masinanimi?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Kataloog"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Täiendav"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -156,23 +180,96 @@ msgstr ""
 "Tarkvara nimekirja sisaldava faili leidmine sellelt peeglilt nurjus. "
 "Kontrollige palun asukohta."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Tuumiktarkvara (core)"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Piirangutega tarkvara (tainted)"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Mittevaba tarkvara (non-free)"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Osa Teie masina riistvarast vajab mittevaba püsivara, et vaba tarkvara "
+"draiverid saaksid korralikult töötada."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Teil tuleks lubada \"%s\" kasutamine"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" sisaldab mitmesugust süsteemile vajalikku tarkvara ja rakendusi"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" sisaldab, nagu nimigi ütleb, mittevaba tarkvara.\n"
+
+#: any.pm:477
+#, 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 ""
+"Samuti sisaldab see püsivara, mida vajavad oma töös mõningad seadmed (nt. "
+"mõned ATI/AMD graafikakaardid, mõned võrgukaardid, mõned RAID-i kaardid jne.)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" sisaldab tarkvara, mida ei ole tarkvarapatentide tõttu võimalik "
+"kõigis riikides vabalt levitada."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "Samuti sisaldab see lisaomaduste huvides ümber ehitatud \"%s\"."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Siin saab soovi korral lubada rohkemate andmekandjate kasutamist."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "See andmekandja sisaldab \"%s\" uuendusi"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Juba paigaldatud pakettide tuvastamine..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Uuendatavate pakettide otsimine..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Pakettide eemaldamine enne uuendamist..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -185,87 +282,87 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldada need paketid?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Viga faili %s lugemisel"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Järgmistele ketastele anti uus nimi:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (varem oli %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Võrk"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Palun valige andmekandja"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fail on juba olemas. Kas kirjutada see üle?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Ligipääs keelatud"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Vigane NFS-i nimi"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Vigane andmekandja %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Ekraanipilte ei saa teha enne partitsioneerimist"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekraanipildid asuvad pärast paigaldamist asukohas %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Paigaldamine"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Seadistamine"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Vormindada tuleb ka %s"
@@ -289,22 +386,22 @@ msgstr "Võrgu aktiveerimine"
 msgid "Bringing down the network"
 msgstr "Võrgu seiskamine"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Palun oodake, tõmmatakse faili"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "andmekandja lisamine nurjus"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Mõningate tarkvarapakettide kopeerimine kettale edasiseks kasutamiseks"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Käib kopeerimine..."
@@ -334,7 +431,23 @@ msgstr "kena"
 msgid "maybe"
 msgstr "võib olla"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Paketi teabe hankimine XML-metaandmetest..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Andmekandjal \"%s\" puudub XML-info, paketil %s on ainult osaline tulemus"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Kirjeldus puudub"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -343,66 +456,76 @@ msgstr ""
 "Mõningaid pakette, mida nõuab %s, ei saa paigaldada:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Tekkis viga:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Tekkis saatuslik viga: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Rohkem ei küsita"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d paigaldamistehingut nurjus"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Pakettide paigaldamine nurjus:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Tööjaam"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontori-tööjaam"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Kontoritöö programmid: tekstitöötlus (OpenOffice.org Writer, KWord), "
-"tabelitöötlus (OpenOffice.org Calc, KSpread), PDF-failide näitajad jne"
+"Kontoritöö programmid: tekstitöötlus (LibreOffice Writer, KWord), "
+"tabelitöötlus (LibreOffice Calc, KSpread), PDF-failide näitajad jne"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Mänguvahend"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Meelelahutus: põnevus-, laua-, strateegiamängud jne"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimeedia-tööjaam"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Heli ja video mängimine ja redigeerimine"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Interneti-tööjaam"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -411,271 +534,327 @@ msgstr ""
 "Valik rakendusi e-posti ja uudiste lugemiseks (mutt, tin...) ning veebi "
 "lehitsemiseks"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Võrguarvuti (klient)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Mitme protokolli, sealhulgas ssh kliendid"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Tööriistad süsteemi lihtsamaks haldamiseks"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsoolitööriistad"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktorid, shellid, terminalid, failihaldus"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Arendus"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C ja C++ arendusteegid, rakendused ja päisefailid"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Raamatud ja HOWTO-d Linuxi ja vabavara kohta"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Kolmandate tootjate rakenduste toetus"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Veebiserver"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Grupitöö"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolabi server"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Tulemüür/marsruuter"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "E-post/Uudistegrupid"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfixi e-posti server, Inn uudisteserver"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Kataloogiserver"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-server"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Nimeserver ja võrguteabeserver"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Faili- ja printserver"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Andmebaasid"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL- ja MySQL-andmebaasiserver"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL- ja MariaDB-andmebaasiserver"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Veeb/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache ja Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfixi e-posti server"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL- või MySQL-andmebaasiserver"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL- või MariaDB-andmebaasiserver"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Võrguserver"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-, SMB-, SSH-server, puhverserver (proxy)"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Graafiline keskkond"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE tööjaam"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "K töölaua keskkond: graafiline töökeskkond ja palju rakendusi"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME tööjaam"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "XFCE tööjaam"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Kergemat sorti graafiline töökeskkond koos kasutajasõbralike rakendustega"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "MATE tööjaam"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Cinnamoni tööjaam"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "GNOME-l põhinev graafiline keskkond"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "LXQT töölaud"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Kergemat sorti graafilise töökeskkonna uue põlvkonna Qt-versioon"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Enlightenment e17 töölaud"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Kergemat sorti kiire graafiline töökeskkond andunud kasutajaskonnaga"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE töölaud"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Kergemat sorti kiire graafiline töökeskkond"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasma töölaud"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr ""
-"Vähese koormusega ja kiire graafiline töökeskkond koos kasutajasõbralike "
-"rakenduste ja tööriistadega"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "Plasma töölaud: põhiline graafiline töökeskkond ja palju rakendusi"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Muud graafilised töölauad"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "WindowMaker, Enlightenment, Fvwm jt"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm jt"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utiliidid"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-server"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin võrguseadistusserver"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Võrguutiliidid ja võrgu jälgimine"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Jälgimistööriistad, protsesside jälgimine, tcpdump, nmap..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia nõustajad"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Serverite seadistamise nõustajad"
@@ -686,10 +865,10 @@ msgid ""
 "An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"Tekkis viga, mida programm ei suuda ise klaarida.\n"
+"Tekkis tõrge, mida programm ei suuda ise klaarida.\n"
 "Jätkake omal vastutusel."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -708,250 +887,250 @@ msgstr "Järgmine samm: %s\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linuxi paigaldamine %s"
+msgid "%s Installation %s"
+msgstr "%s paigaldamine: %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> liigub elementide vahel"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorgi server käivitub aeglaselt. Palun oodake..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Teie süsteemil napib ressurse ja paigaldamine ei pruugi õnnestuda.\n"
-"Kui nii juhtub, proovige palun tekstipõhist paigaldamist. Selleks\n"
-"vajutage CD-lt laadimisel F1 ja sisestage \"text\""
+"Teie süsteemil napib ressursse ja %s paigaldamine ei pruugi õnnestuda.\n"
+"Kui nii juhtub, proovige palun tekstipõhist paigaldamist.\n"
+"Selleks vajutage CD-lt laadimisel F1 ja sisestage \"text\"."
+
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr "Andmekandjate valik"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Mageia KDE töölaua paigaldamine"
+msgid "Install %s KDE Desktop"
+msgstr "%s KDE töölaua paigaldamine"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Mageia GNOME töölaua paigaldamine"
+msgid "Install %s GNOME Desktop"
+msgstr "%s GNOME töölaua paigaldamine"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Kohandatud paigaldamine"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE töölaud"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME töölaud"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Kohandatud töölaud"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Siin näeb '%s' töölaua eelvaatlust."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
-msgstr "Klõpsake piltidel suurema eelvaatluse nägemiseks"
+msgstr "Suurema eelvaatluse nägemiseks klõpsake piltidel."
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Paketigruppide valik"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Valik paketthaaval"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Suurus kokku: %d / %d MB"
+msgid "Unselect All"
+msgstr "Tühista kõigi valimine"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Vigane pakett"
+msgid "Total size: %d / %d MB"
+msgstr "Suurus kokku: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versioon: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Suurus: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Tähtsus: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Seda paketti ei saa valida/valimata jätta"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "puuduva %s tõttu"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "rahuldamata %s tõttu"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
-msgstr "püüan välja pakkuda %s"
+msgstr "püüdes välja pakkuda %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "säilitamaks %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Seda paketti ei saa valida, sest paigaldamiseks napib kettaruumi"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Paigaldamiseks on valitud järgmised paketid"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Eemaldamiseks on valitud järgmised paketid"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "See pakett on kohustuslik"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "See pakett on juba paigaldatud"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Selle paketi peate valima, sest selle uuendamine on kohustuslik"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Automaatselt valitud pakettide näitamine"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Paigalda"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Valiku laadimine/salvestamine"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Paketivaliku uuendamine"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimaalne paigaldus"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Tarkvarahaldur"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Valige paketid, mida soovite paigaldada"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Paigaldamine"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Ãœksikasjadeta"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Aega jäänud:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
-msgstr "(oletus...)"
+msgstr "(arvutatakse...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakett"
 msgstr[1] "%d paketti"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Seadista"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "seadistamata"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Andmekandjate valik"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -960,84 +1139,84 @@ msgstr ""
 "Leiti järgmised paigaldusandmekandjad.\n"
 "Kui Te ei soovi mõnda neist kasutada, eemaldage need valikust."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Teil on võimalik kopeerida CD-de sisu enne paigaldamist kõvakettale.\n"
 "Seejärel jätkatakse paigaldamist kõvakettalt ning kogu tarkvara on seal "
 "kättesaadav ka pärast süsteemi paigaldamist."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopeeri kõik CD-d"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Tekkis viga"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Palun valige klaviatuuriasetus"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "See on saadaolevate klaviatuuriasetuste täielik nimekiri:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Paigaldamine/Uuendamine"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Kas see on paigaldamine või uuendamine?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Paigaldamine"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s uuendamine"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s krüptovõti"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Paigaldamisest loobumine, süsteemi taaskäivitamine"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Uus paigaldus"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Varasema paigalduse uuendamine (ei ole soovitatav)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1053,36 +1232,17 @@ msgstr ""
 "Hoiatus: Te peaksite varundama kõik oma isiklikud andmed,\n"
 "enne kui valite võimaluse \"Uus paigaldus\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE seadistamine"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Ruumi 1MB-se alglaadimisala loomiseks napib! Paigaldamine jätkub, kuid "
-"süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Teil tuleb luua PPC PReP Boot alglaadimisala! Paigaldamine jätkub, kuid "
-"süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1095,12 +1255,12 @@ msgstr ""
 "Palun sisestage CD nimega \"%s\" CD-seadmesse ja klõpsake nupule \"Olgu\".\n"
 "Kui Teil sellist ei ole, klõpsake nupule \"Loobu\"."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Saadaolevate pakettide otsimine..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1108,7 +1268,7 @@ msgid ""
 msgstr ""
 "Teie süsteemis ei jagu ruumi paigaldamiseks ega uuendamiseks (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1117,52 +1277,52 @@ msgstr ""
 "Valige palun paketivaliku laadimine või salvestamine.\n"
 "Vorming on sama, mis automaatpaigaldusega loodud failide puhul."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Laadi"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Salvesta"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Vigane fail"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Töölaua valik"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
-msgstr "Siin saab valida oma arvuti töölauaprofiili: "
+msgstr "Siin saab valida oma arvuti töölauaprofiili."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valiku suurus ületab saadaolevat kettaruumi"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Paigaldamise tüüp"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1171,87 +1331,115 @@ msgstr ""
 "Te ei valinud ühtegi paketigruppi.\n"
 "Palun valige meelepärane minimaalne paigaldus:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X'iga"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Pakutavate pakettide paigaldamine"
+msgid "Install recommended packages"
+msgstr "Soovitatavate pakettide paigaldamine"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Baasdokumentatsiooniga (soovitatav!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
-msgstr "Tõeliselt minimaalne (eriti just ilma urpmi-ta)"
+msgstr "Tõeliselt minimaalne (isegi urpmi-t ei ole)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Uuendamiseks valmistumine..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Paigaldamiseks valmistumine"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Paketi %s paigaldamine"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Pakettide tellimisel tekkis viga:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Kas ikkagi jätkata?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Proovi uuesti"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Jäta pakett vahele"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Jäta kõik andmekandja \"%s\" paketid vahele"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Tagasi andmekandja ja paketivaliku juurde"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Paketi %s paigaldamisel tekkis viga."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Paigaldamisjärgne seadistamine"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Palun kontrollige, et uuenduste andmekandja on seadmes %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Uuendused"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Nüüd on Teil võimalus määrata võrguandmekandjad."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "See lubab paigaldada turbeuuendusi."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Nende andmekandjate määramiseks peab töötama\n"
+"internetiühendus.\n"
+"\n"
+"Kas soovite määrata uuendamisandmekandjad?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1264,35 +1452,36 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Teil on nüüd võimalus alla laadida uuendatud pakette. Need on välja lastud\n"
-"pärast Mageia Linuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"
-"parandusi või turvauuendusi.\n"
+"pärast Mageia distributsiooni ilmumist ja võivad sisaldada vigade\n"
+"parandusi või turbeuuendusi.\n"
 "\n"
 "Allalaadimiseks peab Teil olema töötav internetiühendus.\n"
 "\n"
 "Kas soovite uuendusi paigaldada?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s asukohas %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Riistvara"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Helikaart"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Kas Teil on ISA helikaart?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1301,101 +1490,89 @@ msgstr ""
 "Helikaardi seadistamiseks käivitage pärast paigaldamist \"alsaconf\" või "
 "\"sndconfig\""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Helikaarti ei leitud. Proovige see leida pärast paigaldamist \"harddrake\" "
 "abil"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Graafiline kasutajaliides"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Kohtvõrk ja internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Puhverserverid"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "seadistatud"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
-msgstr "Turvatase"
+msgstr "Turbetase"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Tulemüür"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktiveeritud"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "keelatud"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Te ei ole seadistanud X'i. Kas Te tõesti ei taha seda teha?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Alglaaduri ettevalmistamine..."
+msgid "Preparing initial startup program..."
+msgstr "Alglaadimisprogrammi ettevalmistamine..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Varuge kannatust, see võib võtta veidi aega..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Paistab, et Teil on OldWorld-i või hoopis tundmatu masin, igatahes alglaadur "
-"yaboot siin ei tööta. Paigaldamine küll jätkub, aga masina käivitamiseks "
-"tuleb Teil kasutada BootX'i või mingit muud nippi. Kerneli argument "
-"juurfailisüsteemi jaoks on root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
-"Sellel turvatasemel pääseb Windowsi partitsioonil asuvatele failidele ligi "
+"Sellel turbetasemel pääseb Windowsi partitsioonil asuvatele failidele ligi "
 "ainult administraator."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Pange palun tühi diskett seadmesse %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Kiirpaigaldusdisketi loomine..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1406,15 +1583,15 @@ msgstr ""
 "\n"
 "Kas soovite tõesti praegu lõpetada ja väljuda?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Õnnitleme!"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
-msgstr "Taaskäivitus"
+msgstr "Taaskäivita"
 
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
@@ -1506,13 +1683,6 @@ msgid ""
 "Users"
 msgstr "Kasutajad"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Võrk"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1553,162 +1723,79 @@ msgstr "Uuendused"
 msgid ""
 "_: Keep these entry short\n"
 "Exit"
-msgstr "Välju"
+msgstr "Väljumine"
 
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Kontoritöö programmid: tekstitöötlus (KWord, Abiword), tabelitöötlus "
-#~ "(KSpread, Gnumeric), PDF-failide näitajad jne"
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Alglaaduri ettevalmistamine..."
 
 #~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Otsustasite uuendada oma süsteemi %s peale. Teie süsteemis leiti KDE "
-#~ "3.5.\n"
-#~ "Paigaldusprogramm ei saa uuendamisel KDE 3.5 säilitada. Kui soovite "
-#~ "jätkata,\n"
-#~ "asendatakse KDE 3 KDE 4-ga ja Te kaotate oma isiklikud KDE seadistused.\n"
-#~ "Kui soovite uuendada nii, et KDE 3.5 ja Teie isiklikud seadistused "
-#~ "säiliks,\n"
-#~ "käivitage oma süsteem uuesti ja sooritage uuendamine Mandriva "
-#~ "uuendusapleti abil."
-
-#~ msgid "Proceed"
-#~ msgstr "Jätka"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "[%s] tõmbamine nurjus"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Faili %s allalaadimine..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
 #~ msgstr ""
-#~ "Uuendamine 32-bitiselt distributsioonilt 64-bitisele ei ole toetatud"
+#~ "Kergemat sorti kiire graafiline töökeskkond koos kasutajasõbralike "
+#~ "rakenduste ja tööriistadega"
 
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr ""
-#~ "Uuendamine 64-bitiselt distributsioonilt 32-bitisele ei ole toetatud"
+#~ msgid "RazorQT Desktop"
+#~ msgstr "RazorQT töölaud"
 
 #~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
 #~ msgstr ""
-#~ "Olete valinud järgmise(d) serveri(d): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Need serverid aktiveeritakse vaikimisi. Pole küll teada, et neil oleks\n"
-#~ "turvaprobleeme, aga nende leidmine tulevikus pole sugugi välistatud.\n"
-#~ "Kui peaks nii minema, kontrollige, et suudate uuenduse võimalikult\n"
-#~ "ruttu hankida.\n"
-#~ "\n"
-#~ "\n"
-#~ "Kas tõesti paigaldada need serverid?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "IceWM töölaud"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "Peeglilt pakettide nimekirja lugemine..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Ãœhendust peegliga %s ei saadud"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Loo kiirpaigaldusdiskett"
+#~ "Ruumi 1MB-se alglaadimisala loomiseks napib! Paigaldamine jätkub, kuid "
+#~ "süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
 
 #~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
 #~ msgstr ""
-#~ "Automaatne paigaldamine võib olla ka sedavõrd tegija,\n"
-#~ "et kasutab ära kogu kõvaketta!\n"
-#~ "\n"
-#~ "Võite valida ka lihtsalt paigaldamise kordamise.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Kordamine"
-
-#~ msgid "Automated"
-#~ msgstr "Automaatne"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Salvesta paketivalik"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Kas soovite kasutada aboot-i?"
+#~ "Teil tuleb luua PPC PReP Boot alglaadimisala! Paigaldamine jätkub, kuid "
+#~ "süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
 
 #~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
 #~ msgstr ""
-#~ "Viga aboot-i paigaldamisel, \n"
-#~ "kas sundida peale, riskides esimese partitsiooni hävinguga?"
+#~ "Paistab, et Teil on OldWorld-i või hoopis tundmatu masin, igatahes "
+#~ "alglaadur yaboot siin ei tööta. Paigaldamine küll jätkub, aga masina "
+#~ "käivitamiseks tuleb Teil kasutada BootX'i või mingit muud nippi. Kerneli "
+#~ "argument juurfailisüsteemi jaoks on root=%s"
 
-#~ msgid "All"
-#~ msgstr "Kõik"
+#~ msgid "Welcome"
+#~ msgstr "Tere tulemast"
 
-#~ msgid "TV card"
-#~ msgstr "TV kaart"
+#~ msgid "People!"
+#~ msgstr "Rahvas!"
 
-#~ msgid "Boot"
-#~ msgstr "Alglaadimine"
+#~ msgid "For people"
+#~ msgstr "Kõigile"
 
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Autentimisviis"
+#~ msgid "For contributors"
+#~ msgstr "Kaasautoritele"
 
-#~ msgid "Language"
-#~ msgstr "Keel"
+#~ msgid "For you"
+#~ msgstr "Sulle"
 
-#~ msgid "License"
-#~ msgstr "Litsents"
+#~ msgid "Welcome!"
+#~ msgstr "Tere tulemast!"
 
-#~ msgid "Installation class"
-#~ msgstr "Paigaldamismeetod"
+#~ msgid "Select All"
+#~ msgstr "Kõigi valimine"
 
-#~ msgid "Formatting"
-#~ msgstr "Vormindamine"
+#~ msgid "Bad package"
+#~ msgstr "Vigane pakett"
 
-#~ msgid "Choosing packages"
-#~ msgstr "Pakettide valik"
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Alglaaduri ettevalmistamine..."
 
-#~ msgid "Users"
-#~ msgstr "Kasutajad"
-
-#~ msgid "Networking"
-#~ msgstr "Võrk"
-
-#~ msgid "Configure X"
-#~ msgstr "X'i seadistamine"
+#~ msgid "Mageia, the new Linux distribution"
+#~ msgstr "Mageia, uus Linuxi distributsioon"
 
 #~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "Ligipääs Teie kernelile vastavatele kerneli moodulitele ebaõnnestus "
-#~ "(puudub fail %s), mis enamasti tähendab, et Teie alglaadimisdiskett ei "
-#~ "ole sünkroonis paigaldus-andmekandjaga (palun looge uus "
-#~ "alglaadimisdiskett)"
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Võrk"
diff --git a/perl-install/install/share/po/eu.po b/perl-install/install/share/po/eu.po
index f21224cf9..4a0657117 100644
--- a/perl-install/install/share/po/eu.po
+++ b/perl-install/install/share/po/eu.po
@@ -1,56 +1,87 @@
-# translation of DrakX.po to Euskara
-# EUSKARA: Mandriva Linux translation.
-# Copyright (C) 2002,2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Iñigo Salvador Azurmendi <xalba@euskalnet.net>, 2001-2002,2003,2004, 2005, 2006, 2007, 2008, 2009.
-# Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
+# Translators:
+# Egoitz Rodriguez Obieta <egoitzro@gmail.com>, 2014
+# Egoitz Rodriguez Obieta <egoitzro@gmail.com>, 2014
+# Egoitz Rodriguez Obieta <egoitzro@gmail.com>, 2014-2015
+# Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004
+# Iñigo Salvador Azurmendi <xalba@euskalnet.net>, 2005-2009
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-09-19 08:21+0200\n"
-"Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
-"Language-Team: Basque <kde-i18n-doc@kde.org>\n"
-"Language: eu\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 13:50+0100\n"
+"Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/mageia/language/"
+"eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.3\n"
+"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.6.9\n"
+
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr "Elkartu gurekin!"
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr "Zurea egin ezazu!"
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr "Zure aukera!"
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, c-format
+msgid "Office tools"
+msgstr "Bulegoko tresnak"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr "Etxe entretenimendua"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Zure idaztegia USB giltza batean"
+msgid "For kids"
+msgstr "Umeentzat"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "100%% iturburu irekia duen Mageia Linux banaketa"
+msgid "For family!"
+msgstr "Familiarentzat!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Esploratu Linux era errazean Mageia One-kin"
+msgid "For developers!"
+msgstr "Garatzaileentzat!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Mageia Linux idaztegi oso bat, eukarriarekin"
+msgid "Thank you!"
+msgstr "Eskerrik asko!"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: guztientzako beharrak asetzeko banaketak"
+msgid "Be Free!"
+msgstr "Libre izan!"
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Baduzu beste euskarri osagarririk?"
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#. -PO: keep the double empty lines between sections, this is formatted a la
+#. LaTeX
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -63,116 +94,188 @@ msgstr ""
 "\n"
 "Badaukazu konfiguratu beharreko gainerako instalazio euskarririk?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Sarea (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Sarea (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Sarea (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Ispiluaren URL?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL-ak ftp:// edo http:// aurretik izan behar du"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Mageia Linux web gunearekin konektatzen, ispilu erabilgarrien zerrenda "
-"lortzeko..."
+"%s web gunearekin konektatzen, ispilu erabilgarrien zerrenda lortzeko..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Mageia Linux web gunearekin eskuragarri dauden ispiluen zerrenda lortzeko "
-"harremanak huts egin du"
+"%s web gunearekin eskuragarri dauden ispiluen zerrenda lortzeko harremanak "
+"huts egin du"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Aukeratu ispilu bat paketeak bertatik hartzeko"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS ezarpena"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Mesedez sartu zure NFS euskarriaren ostalari izena eta direktorioa"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Ostalari izena falta da"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Direktorioa honekin \"/\" hasi behar da"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS muntaiaren ostalari izena?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Direktorioa"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Osagarria"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Ezin aurkitu hdlist fitxategia ispilu honetan"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Zure makinako hardwareren batek firmwares ez libre batzuk behar ditu lan "
+"egiteko software gidari libreen ordez."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "\"%s\" gaitu dezakezu"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "sistemak eta bere aplikazioak askotariko \"%s\" piezak dauzka"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "%s\"-k software ez librea dauka.\n"
+
+#: any.pm:477
+#, 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 ""
+"Nolabaiteko tresnek maneiatu behar izandako firmwareak dauzka (adib.: ATI/"
+"AMD-etako grafikoko txartel batzuk, sare-txartel batzuk, RAID txartel "
+"batzuk, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" herrialde bakoitzean software-patenteengatik banatu ezin duten "
+"softwarea dauka."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "\"%s\"-ren softwarea er dauka, birsortzeko gaitasun osagarriekin."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Hemen hedabide gehiago gaitu dezakezu nahi baduzu."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Hedabide honek paketea \"%s\" hedabidetik eguneratzea ematen du"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Instalatutako paketeak bilatzen..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Bertsio berritzeko paketeak bilatzen..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Paketeak ezabatzen bertsioa berritu aurretik..."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#. -PO: keep the double empty lines between sections, this is formatted a la
+#. LaTeX
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -185,88 +288,88 @@ msgstr ""
 "\n"
 "Ziur zaude pakete hauek kendu nahi dituzula?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Errorea %s fitxategia irakurtzean"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Ondoko diskoa(k) berrizendatu egin d(ir)a:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (lehenago %s deitua)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Sarea"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Aukeratu euskarri bat mesedez"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fitxategia badago lehendik ere. Gainidatzi?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "NFS izen okerra"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "%s okerreko euskarria"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Ezin da pantaila-argazkirik egin partizioak egin aurretik"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 "%s(e)n instalazioa egindakoan pantaila-argazkiak erabilgarri egongo dira"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalaketa"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "%s ere formateatu behar duzu"
@@ -290,22 +393,22 @@ msgstr "Sarea irekitzen"
 msgid "Bringing down the network"
 msgstr "Sarea ixten"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Itxoin mesedez, fitxategia eskuratzen"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "euskarria ezin erantsi"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Zenbait pakete diskoetan kopiatzen etorkizunean erabiltzeko"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiatzen ari da"
@@ -335,7 +438,24 @@ msgstr "baliagarria"
 msgid "maybe"
 msgstr "beharbada"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "XML meta-datuetatik paketeen informazioa eskuratzen ..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Ez dago \"%s\" euskarriarentzako xml info, soilik emaitza partziala %s "
+"paketearentzako"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Azalpenik ez"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -344,67 +464,77 @@ msgstr ""
 "%s-k eskatutako pakete batzuk ezin dira instalatu:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Akats bat gertatu da:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Akats larria gertatu da: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Ez galdetu beriro"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instaketa eragiketek huts egin dute"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Paketeen instalaketak huts egin du:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Lanpostua"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Bulegoko lanpostua"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Bulego programak: testu-prozetzaileak (OpenOffice.org Writer, Kword), "
-"kalkulu-orriak (OpenOffice.org Calc, Kspread), PDF ikustaileak, etab"
+"Bulego programak: testu-prozetzaileak (LibreOffice Writer, Kword), kalkulu-"
+"orriak (LibreOffice Calc, Kspread), PDF ikustaileak, etab"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Jokoak"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 "Denbora-pasako programak: makina-jokoak, taula-jokoak, estrategiakoak, etab."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Soinua eta bideoa jotzeko/editatzeko programak"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -413,193 +543,193 @@ msgstr ""
 "Posta eta berri-taldeetako mezuak (mutt, tin...) irakurtzeko eta bidaltzeko "
 "eta Interneten nabigatzeko tresna-multzoa"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Sare-ordenagailua (bezeroa)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Hainbat protokolotako bezeroak, ssh-renak barne"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Zure ordenagailuaren konfigurazioa errazteko tresnak"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Kontsola-tresnak"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editoreak, shell-ak, fitxategi-tresnak, terminalak"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Garapena"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C eta C++ garapen-liburutegiak, programak eta fitxategiak"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentazioa"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux eta Software libreari buruzko liburuak eta azalpenak"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Beste batzuek egindako aplikazioen euskarria"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Web zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Taldelanerako Aplikazioak"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Suebakia/Bideratzailea"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Interneteko atebidea"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Posta/Berriak"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix posta zerbitzaria, Inn berri zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Direktorio Zerbitzara"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domeinu Izen eta Sare Informazio Zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fitxategi eta Inprimaketa Elkarbanatzeko Zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS zerbitzaria, Samba zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Datu-basea"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL eta MySQL Datubase Zerbitzaria"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL eta MariaDB Datubase Zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Posta"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix posta-zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL edo MySQL datu-baseen zerbitzaria"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL edo MariaDB datu-baseen zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Sare-zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS zerbitzaria, SMB zerbitzaria, Proxy zerbitzaria, ssh zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ingurune grafikoa"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE lanpostua"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -607,12 +737,12 @@ msgid ""
 msgstr ""
 "K Desktop Environment, hainbat tresna dituen oinarrizko ingurune grafikoa"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME lanpostua"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -621,66 +751,124 @@ msgstr ""
 "Aplikazio-multzo eta mahaigaineko tresna lagungarri eta atseginak dituen "
 "ingurune grafikoa"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "XFCE lanpostua"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Aplikazioen eta mahaigain-tresnen sorta erabilerrazarekiko ingurumen argitsu "
+"grafiko bat"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "MATE lanpostua"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Cinnamon Lanpostua"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "GNOMEn oinarritutako ingurune grafikoa"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "LXQT Mahaigaina"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Mahaigaineko ingurune arinaren hurrengo belaunaldiko QT portua"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Enlightenment e17 Mahaigaina"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Ingurune grafiko arin eta azkarra bat eskainita"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE Idaztegia"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Ingurune grafiko arin bat"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasma Mahaigaina"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Ingurune grafiko arin eta azkarra aplikazio multzo eta mahaigaineko tresna "
-"erabilerrazak dituena"
+"Plasma mahaigaina, oinarrizko ingurune grafikoa erantsitako tresna bildumekin"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Beste mahaigain grafiko batzuk"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, etab."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilitateak"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin Urruneko Konfigurazio Zerbitzaria"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Sare Utilitateak/Gainbegiraketa"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Gainbegiraketa tresnak, prozesuen kotabilitatea, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia Morroiak"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Zerbitzaria konfiguratzeko morroiak"
@@ -694,7 +882,7 @@ msgstr ""
 "Errore bat gertatu da, baina ez dakit behar bezala maneiatzen.\n"
 "Jarraitu zure ardurapean."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -714,250 +902,250 @@ msgstr "`%s'. urratsean sartzen\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux %s instalazioa"
+msgid "%s Installation %s"
+msgstr "%s %s instalazioa"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> elementuz aldatzeko"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg zerbitzariaren hasiera motela da. Itxoin mesedez..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Sistemak baliabide gutxi ditu. Arazoak izan ditzakezu Mageia Linux \n"
+"Sistemak baliabide gutxi ditu. Arazoak izan ditzakezu %s \n"
 "instalatzeko. Horrela bada, testu-instalazioa egiten saia zaitezke. \n"
 "Horretarako, sakatu `F1' CD-ROMetik abiaraztean, eta idatzi `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Instalatu Mageia KDE Idaztegia"
+msgid "Media Selection"
+msgstr "Euskarri hautaketa"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Instalatu Mageia GNOME Idaztegia"
+msgid "Install %s KDE Desktop"
+msgstr "Instalatu %s KDE Idaztegia"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Instalatu %s GNOME Idaztegia"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Instalaketa pertsonalizatua"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE Idaztegia"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME Idaztegia"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Idaztegia pertsonalizatua"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Hemen duzu '%s' idaztegiaren aurrebista bat."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klikatu irudietan aurrebista haundiago ikusteko"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakete-taldearen hautapena"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Pakete indibidualen hautapena"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Guztizko tamaina: %d / %d MB"
+msgid "Unselect All"
+msgstr "Desautatutako guztiak"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Pakete txarra"
+msgid "Total size: %d / %d MB"
+msgstr "Guztizko tamaina: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Bertsioa: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Tamaina: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Garrantzia: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Ezin duzu pakete hau hautatu/desautatu"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s falta delako"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s bete gabe dagoelako"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s jaso nahian"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s gordetzeko"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Ezin duzu pakete hori hautatu: ez dago instalatzeko lekurik"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Ondorengo pakete hauek instalatuko dira"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Ondorengo pakete hauek kenduko dira"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Nahitaezko paketea da, ezin da desautatu"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Ezin duzu pakete hau desautatu. Dagoeneko instalatuta dago"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Ezin duzu pakete hau desautatu. Bertsio berritu egin behar da"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Erakutsi automatikoki hautatutako paketeak"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalatu"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Hautapena Zamatu/Gorde"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Pakete-hautapena eguneratzen"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Gutxieneko instalazioa"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Software kudeaketa"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Aukeratu instalatu nahi dituzun paketeak"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalatzen"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
-msgstr "Xehetasunik ez"
+msgstr "Xehetasunik gabe"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Geratzen den denbora:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(Kalkulatzen...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "pakete %d"
 msgstr[1] "%d pakete"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Laburpena"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Konfiguratu"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "konfiguratu gabe"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Euskarri hautaketa"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -966,84 +1154,84 @@ msgstr ""
 "Ondorengo instalazio euskarriak aurkitu dira.\n"
 "Horietako batzuk erabiltzerik nahi ez baduzu, haututik kendu ditzakezu orain."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Instalazio aurretik CD-en edukia disko zurrunera kopiatzeko aukera daukazu.\n"
 "Disko zurrunetik jarraituko du orduan eta paketeak eskuragarri egongo dira "
 "sistema osorik instalatu ondoren."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiatu CD osoak"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Errore bat izan da"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Aukeratu zure teklatu-diseinua"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Hemen duzu eskuragarri dauden teklatuen zerrenda osoa:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalaketa/Bertsio berritzea"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Instalaketa edo bertsio berritzea da hau?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalaketa"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s bertsio berritu"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s(r)en enkriptatze-gakoa"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Instalaketa galarazi, sistema berrabiatu"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Instalaketa berria"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Aurreko instalaketa bertsio berritu (ez da gomendatzen)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1051,46 +1239,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Instalatzaileak detektatu du instalatuta duzun Mageia Linux sistema ezin\n"
-"dela era seguruan %s-ra bertsio berritu.\n"
+"Instalatzaileak detektatu du instalatuta duzun Linux sistema ezin\n"
+"dela era seguruan %s-ren bertsiora berritu.\n"
 "\n"
-"Zure aurreko sistema ordezkatuko duen instalaketa berria gomendatzen da.\n"
+"Zure aurreko sistema ordezkatuko duen instalazio berria gomendatzen da.\n"
 "\n"
 "Erne: zure datu pertsonalen babeskopia egin behar zenuke \"Instalaketa\n"
-"Berria\" aukeratu aurretik\"."
+"Berria\" aukeratu aurretik."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE konfiguratzen"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Ez dago lekurik 1 MBeko bootstrap-a sortzeko! Instalazioak jarraituko du, "
-"baina sistema abiarazteko, bootstrap partizioa sortu beharko duzu DiskDrake-"
-"rekin"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"PPC PReP abiapen bootstrap bat sortu beharko duzu! Instalaketak aurrera "
-"jarraituko du, baino zure sistema abiarazteko, bootstrap partizioa sortu "
-"beharko duzu DiskDrake erabiliz"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1104,12 +1271,12 @@ msgstr ""
 "'Ados'.\n"
 "Ez badaukazu, sakatu 'Utzi' CD-ROM horretatik instalazioa egin ez dezan."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Pakete erabilgarriak bilatzen..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1118,7 +1285,7 @@ msgstr ""
 "Zure sistemak ez dauka instalatu edo bertsio berritzeko behar duen lekua (%d "
 "MB > %d MB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1127,52 +1294,52 @@ msgstr ""
 "Mesedez aukeratu pakete aukeraketa zamatu edo gorde.\n"
 "Formatua instalazio automatikoarekin sortutako fitxategiaren berdina da."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Karga"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Gorde"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Okerreko fitxategia"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Idaztegi hautaketa"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Zure lanpostuaren idaztegi profila hautatu dezakezu."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Hautatutako tamaina handiagoa da leku erabilgarria baino"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Instalazio-mota"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1181,87 +1348,114 @@ msgstr ""
 "Ez duzu talde edo paketerik hautatuta\n"
 "Nahi duzun gutxieneko instalazioa hautatu behar duzu:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
-msgstr "Xrekin"
+msgstr "X-ekin"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Instalatu iradokitako paketeak"
+msgid "Install recommended packages"
+msgstr "Gomendaturiko paketeak instalatu"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Oinarrizko dokumentazioarekin (gomendatua)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instalazio minimo-minimoa (batez ere, urpmi gabe)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Berritzea prestatzen ..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Instalazioa prestatzen"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s paketea instalatzen"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Errore bat izan da paketeak ordenatzean:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Jarraitu hala ere?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Berriro saiatu"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Pakete hau utzi"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\" euskarriko pakete guztiak utzi"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Jo atzera euskarri eta pakete hautapenera"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Akatsa gertatu da %s paketea instalatzerakoan."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Instalazio-ondorengo konfigurazioa"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Mesedez egiaztatu Moduluak Eguneratzeko euskarria %s unitatean dagoela"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Eguneraketak"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Orain aukera duzu lerroko baliabideak konfiguratzeko."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Hau segurtasun eguneraketak instalatzeko ahalbidetzen du."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Baliabideak konfiguratzeko, Interneteko konexioa izan behar izango duzu.\n"
+"\n"
+"Konfiguratu nahi dituzu eguneratze baliabideak?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1274,7 +1468,7 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Pakete eguneratuak deskarga ditzakezu orain. Pakete hauek\n"
-"eguneratu egin dira banaketaren ondoren. Beharbada\n"
+"eguneratu egin dira banaketa askatu ondoren. Beharbada\n"
 "segurtasun edo akatsen konponketak izango dituzte.\n"
 "\n"
 "Pakete hauek deskargatzeko, Interneteko konexioa izan behar\n"
@@ -1282,28 +1476,29 @@ msgstr ""
 "\n"
 "Eguneratzeak instalatu nahi dituzu?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s - %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardwarea"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Soinu-txartela"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ISA soinu-txartela duzu?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1312,82 +1507,70 @@ msgstr ""
 "Instalazioa egindakoan, exekutatu \"alsaconf\" edo \"sndconfig\" soinu-"
 "txartela konfiguratzeko"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Ez da detektatu soinu-txartelik. Probatu \"harddrake\" instalazioa egin "
 "ondoren"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfaze grafikoa"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Sarea eta Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxy-ak"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "konfiguratuta"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Segurtasun-maila"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Suebakia"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktibatuta"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "desgaituta"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "X ez duzu konfiguratu. Ziur zaude hori dela egin nahi duzuna?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Abioko kargatzailea prestatzen..."
+msgid "Preparing initial startup program..."
+msgstr "Programaren hasierako abioa prestatzen ..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Pazientzia izan, pixka baterako dauka..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"OldWorld edo makina ezezagun bat daukazula dirudi, yaboot abiozamatzaileak "
-"ez du zurean lanegingo. Instalaketak aurrera jarraituko du, baino BootX edo "
-"abiatzeko beste bide bat erabili beharko duzu zure makina abiarazteko. Erro "
-"fitxategi sistemarentzako nukleo argumentua honakoa da: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1396,17 +1579,17 @@ msgstr ""
 "Segurtasun-maila honetan, administratzaileak soilik du Windows partizioko "
 "fitxategiak atzitzeko eskubidea."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sartu diskete huts bat %s unitatean"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Auto-instalazioko disketea sortzen..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1417,17 +1600,18 @@ msgstr ""
 "\n"
 "Ziur zaude orain irten nahi duzula?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Zorionak"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Berrabiarazi"
 
-#. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
+#. -PO: please keep the following messages very short: they must fit in the
+#. left list of the installer!!!
 #: steps_list.pm:16
 #, c-format
 msgid ""
@@ -1517,13 +1701,6 @@ msgid ""
 "Users"
 msgstr "Erabiltzaileak"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Saregintza"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1565,73 +1742,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Irten"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Bulego-lanetako programak: testu prozesatzaileak (kword, abiword), "
-#~ "kalkulu orriak (kspread, gnumeric), pdf erakusleak, etab."
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Zure sistema %s-ra bertsio berritzea erabaki duzu. KDE 3.5 detektatu da "
-#~ "zure\n"
-#~ "sisteman. Instalatzaile honek ezin du KDE 3.5 mantendu bertsio "
-#~ "berritzean. Jarraitzea erabakitzen baduzu, \n"
-#~ "KDE 4-k KDE 3 ordezkatuko du, eta zure KDE konfiguraketa ezarpen "
-#~ "pertsonalak galduko dituzu.\n"
-#~ "KDE 3.5-ekin bertsio berritu eta zure ezarpen pertsonalak mantentzeko, \n"
-#~ "berrabiatu zure sistema eta bertsio berritu Mandrivaren eguneraketa "
-#~ "appleta erabiliz."
-
-#~ msgid "Proceed"
-#~ msgstr "Jarratiu"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "[%s]-ren berreskuratzeak huts egin du"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "%s fitxategiak jaisten..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr ""
-#~ "32bit-eko banaketa batetik 64bit-ekora bertsio berritzea ez da onartzen"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr ""
-#~ "64bit-eko banaketa batetik 32bit-ekora bertsio berritzea ez da onartzen"
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Zerbitzari hau(ek) hautatu d(it)uzu: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Zerbitzari horiek lehenespenez aktibatzen dira. Ez dute segurtasun-"
-#~ "arazo \n"
-#~ "ezagunik, baina berriren bat ager liteke. Horrelakorik gertatuz gero,\n"
-#~ "bertsioa lehenbailehen berritu behar duzu.\n"
-#~ "\n"
-#~ "\n"
-#~ "Ziur zaude zerbitzari hauek instalatu nahi dituzula?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "IceWm Idaztegia"
diff --git a/perl-install/install/share/po/fa.po b/perl-install/install/share/po/fa.po
index 243d86591..b04e94816 100644
--- a/perl-install/install/share/po/fa.po
+++ b/perl-install/install/share/po/fa.po
@@ -1,54 +1,81 @@
-# translation of DrakX-fa.po to Persian
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-# Abbas Izad <abbasizad@hotmail.com>, 2003, 2004, 2005.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Abbas Izad <abbasizad@hotmail.com>, 2003-2005
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-fa\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2005-02-26 06:31+0100\n"
-"Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
-"Language-Team: Persian\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 04:07+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Persian (http://www.transifex.com/MageiaLinux/mageia/language/"
+"fa/)\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "آیا رسانه مکمل دیگری دارید؟"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -57,116 +84,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "شبکه (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "شبکه (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "نشانی اینترنتی آینه؟"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"در حال تماس گر�تن با وب‌گاه لینوکس ماندریبا برای دریا�ت لیست پایگاه‌های "
-"آینه‌های موجود..."
 
-#: any.pm:187
-#, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+#: any.pm:253
+#, c-format
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"در حال تماس گر�تن با وب‌گاه لینوکس ماندریبا برای دریا�ت لیست پایگاه‌های "
-"آینه‌های موجود..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "انتخاب آینه‌ای برای گر�تن بسته‌ها"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "شاخه"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "نمیتوان پرونده hdlist را بر این آینه پیدا کرد"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "بررسی بسته‌های از قبل نصب شده..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "یا�تن بسته‌های برای ارتقاء..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -179,87 +267,87 @@ msgstr ""
 "\n"
 "آیا واقعاً می‌خواهید این بسته‌ها را بردارید؟\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "خطا در خواندن پرونده‌ی %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "دیسک(های) بدنبال تغییر نام داده شده‌اند:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (قبلا نامش %s بود("
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "شبکه"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "لط�اً رسانه‌ای را انتخاب کنید"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "پرونده از قبل وجود دارد. بازنویسی شود؟"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "اجازه داده نشد"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "رسانه بد %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "نمی‌توان قبل از قسمت‌بندی عکس‌ص�حه گر�ت"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "عکس‌ص�حه‌ها بعد از نصب در %s در دسترس خواهند بود"
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
-msgstr "نصب کردن"
+msgstr ""
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "پیکربندی"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "باید %s را قالب‌بندی کنید"
@@ -283,22 +371,22 @@ msgstr "بالا آوردن شبکه"
 msgid "Bringing down the network"
 msgstr "پایین آوردن شبکه"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "کپی کردن در حال انجام است"
@@ -328,342 +416,424 @@ msgstr "خوب"
 msgid "maybe"
 msgstr "شاید"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr ""
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "خطائی رخ داد"
+msgstr ""
 
-#: pkgs.pm:814
-#, fuzzy, c-format
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "یک خطای مهلک رخ داد: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
+#, c-format
 msgid "%d installation transactions failed"
-msgstr "نصب شکست خورد"
+msgstr ""
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "نصب کردن بسته‌ی %s"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "ایستگاه‌کار"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "ایستگاه‌کار د�تری"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"برنامه های د�تری: واژه پردازان (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"برنامه های د�تری: واژه پردازان (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "ایستگاه بازی"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "برنامه‌های سرگرمی: آرکید، تخته‌ها، تاکتیکی، غیره"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "ایستگاه چندرسانه‌ای"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "برنامه‌های ویرایش/پخش ویدیو و صوت"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "ایستگاه اینترنت"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "مجموعه ابزار خواندن و ارسال پست و اخبار (mutt, tin..) و برای مرور وب"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "رایانه‌ی شبکه (کارگیر)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "کارگیرها برای پایان‌نامه‌های گوناگون از جمله ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "ابزارهای برای آسان‌ کردن پیکربندی رایانه‌اتان"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "ابزارهای کنسول"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "برنامه‌سازی"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "نوشتار"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "پایه‌ی استاندارد لینوکس. حمایت برنامه‌های شخص سوم"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "کارگزار‌ وب"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "آپاچ"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "گروه ا�زار"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "کارگزار Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "دیوار‌آتش/مسیریاب"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "دروازه‌ی اینترنت"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "پست/اخبار"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "کارگزار پست Postfix، کارگزار اخبار Inn "
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "کارگزار شاخه"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "کارگزار FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "نام دامنه و کارگزار اطلاعات شبکه"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "کارگزاراشتراک چاپگر و پرونده"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "بانک ‌اطلاعات"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "کارگزار پایگاه داده‌ی PostgreSQL و MySQL "
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "کارگزار پایگاه داده‌ی PostgreSQL و MariaDB "
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "پست"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "کارگزار پست Postfix "
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "کارگزار بانک اطلاعاتی PostgreSQL یا MySQL "
+msgid "PostgreSQL or MariaDB database server"
+msgstr "کارگزار بانک اطلاعاتی PostgreSQL یا MariaDB "
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "کارگزار شبکه‌ی رایانه"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "محیط گرا�یکی"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "ایستگاه‌کار KDE "
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "ایستگاه‌کار گنوم"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "محیط گرا�یکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "رومیزی Plucker"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr "محیط گرا�یکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "دیگر رومیزی‌های گرا�یکی"
 
-#: share/meta-task/compssUsers.pl:150
-#, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:200
+#, c-format
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "وسایل"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "کارگزار‌ SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "کارگزار پیکربندی از راه دور Webmin "
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "پایشگری/وسایل شبکه"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "ابزار پایشگری، پروسه های حسابداری، tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "جادوگران نرم ا�زار ماندریبا"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "جادوگران برای پیکربندی کارگزار"
@@ -677,7 +847,7 @@ msgstr ""
 "خطائی رخ داد، اما نمی‌دانم چگونه آن را بخوبی اداره کنم.\n"
 "با مسئولیت خودتان ادامه دهید."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -697,253 +867,248 @@ msgstr "ورود به مرحله‌ی `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "نصب لینوکس ماندریبا %s"
+msgid "%s Installation %s"
+msgstr ""
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> بین عناصر"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"سیستم شما منابع کمی دارد. ممکن است در نصب لینوکس ماندریبا با اشکال برخورد "
-"کنید. \n"
-"اگر این ات�اق رخ داد، می‌توانید نصب متنی را بجایش امتحان کنید. برای این کار، "
-"`F1' را \n"
-"هنگام آغازگری با سی‌دی �شار داده، سپس `text' وارد کنید."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr ""
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "نصب حداقل"
+msgstr ""
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "رومیزی Plucker"
+msgstr ""
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "رومیزی Plucker"
+msgstr ""
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "رومیزی Plucker"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "گزینش گروه بسته"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "انتخاب بسته‌ی تکی"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "اندازه‌ی کل: %d / %d مگابایت"
+msgid "Unselect All"
+msgstr "همه انتخاب نشده‌اند"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "بسته‌ی خراب"
+msgid "Total size: %d / %d MB"
+msgstr "اندازه‌ی کل: %d / %d مگابایت"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "نسخه: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "اندازه: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d کیلوبایت\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "اهمیت: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "نمی‌توانید این بسته را انتخاب/غیر انتخاب کنید"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "بدلیل �قدان %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "بدلیل عدم ارضای %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "تلاش برای تبلیغ %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "بمنظور نگهداشتن %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "نمی‌توانید این بسته را انتخاب کنید چرا که �ضای کا�ی برای نصب آن باقی نمانده "
 "است"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "بسته‌های بدنبال آمده نصب خواهند شد"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "بسته‌های بدنبال آمده برداشته خواهند شد"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "این بسته‌ای ضروری است، نمی‌تواند که گزیده نشود."
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "نمی‌توانید این بسته را انتخاب نکنید. آن از قبل نصب شده است "
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "نمی‌توانید این بسته را انتخاب نکنید. این باید ارتقاء داده شود"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "نشان دادن خودکار بسته‌های انتخاب شده"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "نصب"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "بارگذاری/ذخیره انتخاب"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "بروزسازی مجموعه بسته"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "نصب حداقل"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "مدیریت نرم‌ا�زار"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "بسته‌هایی را که می‌خواهید نصب کنید انتخاب کنید"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "نصب کردن"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "بدون جزئیات"
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "زمان باقیمانده "
+msgstr ""
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "تخمین زدن"
+msgstr ""
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "بسته‌های %d"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "خلاصه"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "پیکربندی"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "پیکربندی نشده است"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "گزینش گروه بسته"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -952,84 +1117,84 @@ msgstr ""
 "رسانه نصب بدنبال آمده یا�ت شد.\n"
 "اگر میخواهید بعضی از آنها را نادیده بگیرید میتوانید آنها را اکنون نگزینید."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "شما میتوانید محتویات سی‌دی‌ها را قبل از نصب بر روی دیسک سخت کپی کنید.\n"
 "سپس آن از دیسک سخت ادامه یا�ته و بسته‌ها وقتی که سیستم کاملا نصب گردید در "
 "دسترس خواهند بود."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "کپی کردن تمام سی‌دی‌ها"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "خطائی رخ داد"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "لط�اً طرح ص�حه‌کلید خود را انتخاب کنید"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "این لیست کامل ص�حه‌کلیدهای در دسترس می‌باشد"
+msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "نصب/ارتقاء"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "آیا این یک نصب است یا یک ارتقاء؟"
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "نصب"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "ارتقاء دادن %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "کلید رمزی برای %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "نصب کردن"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1038,36 +1203,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "پیکربندی IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"هیچ �ضای آزادی برای ۱ مگابایت تسمه‌ی آغازگری ! نصب ادامه پیدا خواهد کرد، ولی "
-"باید قسمت‌بندی تسمه آغازگری را در DiskDrake ایجاد کنید"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"شما نیاز به ایجاد یک تسمه‌ی آغازگری PPC PReP دارید! نصب ادامه پیدا خواهد کرد، "
-"ولی باید قسمت‌بندی تسمه آغازگری را در DiskDrake ایجاد کنید"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1080,19 +1226,19 @@ msgstr ""
 "�شار دهید. \n"
 "اگر آن را ندارید، لغو را برای جلوگیری از نصب این سی‌دی-رم �شار دهید."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "جستجو برای بسته‌های موجود..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1101,52 +1247,52 @@ msgstr ""
 "لط�اً بارگذاری یا ذخیره‌ی مجموعه بسته را انتخاب کنید.\n"
 "قالب همانند پرونده‌های تولید شده‌ی نصب-خودکار است."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "بارگذاری"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "ذخیره"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "پرونده بد"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "گنوم"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "گزینش گروه بسته"
+msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "اندازه‌های انتخاب شده بزرگ‌تر از �ضای موجود است"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "نوع نصب"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1155,87 +1301,111 @@ msgstr ""
 "هیچ گروه از بسته‌ها را انتخاب نکرده‌اید.\n"
 "لط�اً حداقل نصبی را که می‌خواهید انتخاب کنید:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "با X"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "نصب کردن بسته‌ی %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "با نوشتارهای پایه (س�ارش می‌شود!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "حقیقتاً حداقل نصب (مخصوصاً بدون urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "آماده کردن نصب"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "نصب کردن بسته‌ی %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "خطائی در مرتب کردن بسته‌ها رخ داد:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "ادامه به هر حال؟"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
-#, fuzzy, c-format
+#: steps_interactive.pm:682
+#, c-format
 msgid "Go back to media and packages selection"
-msgstr "ذخیره‌ی مجموعه بسته‌ها"
+msgstr ""
 
-#: steps_interactive.pm:683
-#, fuzzy, c-format
+#: steps_interactive.pm:685
+#, c-format
 msgid "There was an error installing package %s."
-msgstr "خطائی هنگام نصب بسته‌ها وجود داشت:"
+msgstr ""
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "پیکربندی بعد از نصب"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "بروزسازی‌ها"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1255,28 +1425,29 @@ msgstr ""
 "\n"
 "آیا می‌خواهید بروزسازی‌ها را نصب کنید؟"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s بر %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "سخت‌ا�زار"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "کارت صوتی"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "آیا کارت صوتی ISA دارید؟"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1285,81 +1456,68 @@ msgstr ""
 "برای پیکربندی کارت صوتی خود بعد از نصب برنامه‌ی \"sndconfig\" یا \"alsaconf"
 "\"  را اجرا کنید"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "هیچ کارت صوتی شناسایی نشد. \"harddrake\" را بعد از نصب امتحان کنید"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "واسط گرا�یکی"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "شبکه و اینترنت"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "پراکسی‌ها"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "پیکربندی شده"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "سطح امنیتی"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "دیوارآتش"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "�عال شده"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "از کار ا�تاده"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "شما ایکس را پیکربندی نکرده‌اید. آیا واقعاً مطمئنید که این را می‌خواهید؟"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "آماده کردن بارگذار آغازگر..."
-
-#: steps_interactive.pm:1027
-#, c-format
-msgid "Be patient, this may take a while..."
+msgid "Preparing initial startup program..."
 msgstr ""
 
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1041
 #, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
+msgid "Be patient, this may take a while..."
 msgstr ""
-"بنظر میرسد که شما یک رایانه‌ی عهد عتیق یا ناشناس دارید، \n"
-"بارگزار آغازگر یابوت برای شما کار نخواهد کرد. \n"
-"این نصب ادامه پیدا خواهد کرد، ولی شما باید \n"
-"از BootX یا طریق دیگری برای آغازگری است�اده کنید.  آرگومان هسته برای سیستم "
-"پرونده ریشه: root=%s"
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1367,17 +1525,17 @@ msgid ""
 msgstr ""
 "در این سطح امنیتی، دستیابی به پرونده‌های قسمت‌بندی ویندوز محدود به مدیر است."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "یک دیسکچه‌ی خالی را در گرداننده‌ی %s داخل کنید"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "ایجاد کردن دیسکچه‌ی نصب خودکار..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1388,12 +1546,12 @@ msgstr ""
 "\n"
 "واقعاً می‌خواهید اکنون ترک کنید؟"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "تبریک می‌گوئیم!"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "آغازگری مجدد"
@@ -1488,13 +1646,6 @@ msgid ""
 "Users"
 msgstr "کاربران"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "شبکه‌کاری"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1536,145 +1687,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "خروج"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "برنامه‌های د�تری: واژه پردازها ((kword, abiword), برگ‌های حساب (kspread, "
-#~ "gnumeric), نماگرهای pdf و غیره"
-
-#, fuzzy
-#~ msgid "Downloading file %s..."
-#~ msgstr "�رستادن پرونده‌ها..."
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "شما کارگزار(های) بدنبال آمده را انتخاب کرده‌اید: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "این کارگزارها در پیش‌�رض �عال شده‌اند. آنها هیچ اشکال امنیتی شناخته شده‌ای\n"
-#~ "ندارند، ولی اشکالات جدید می‌توانند پیدا شوند. در آن صورت شما باید هر چه\n"
-#~ "زودتر آنها را ارتقاء دهید.\n"
-#~ "\n"
-#~ "\n"
-#~ "آیا واقعا می‌خواهید این کارگزارها را نصب کنید؟\n"
-
-#, fuzzy
-#~ msgid "IceWm Desktop"
-#~ msgstr "رومیزی Plucker"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "تماس گر�تن با آینه برای گر�تن لیست بسته‌های موجود..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "نمی‌توان با آینه %s تماس برقرار کرد"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "تولید دیسکچه‌ی نصب خودکار"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "اگر بخواهید نصب خودکار می‌تواند کاملا خودکار عمل کند، \n"
-#~ "که در آن صورت گرداننده‌ی دیسک را در اختیار می‌گیرد!! \n"
-#~ "(این برای نصب بر رایانه دیگری منظور شده است) \n"
-#~ "\n"
-#~ "ممکن است ترجیح دهید نصب را اجرای مجدد کنید.\n"
-
-#~ msgid "Replay"
-#~ msgstr "بازپخش"
-
-#~ msgid "Automated"
-#~ msgstr "خودکار"
-
-#~ msgid "Save packages selection"
-#~ msgstr "ذخیره‌ی مجموعه بسته‌ها"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "آیا می‌خواهید از aboot است�اده کنید؟"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "خطا در نصب aboot, \n"
-#~ "تلاش به اجبار نصب می‌کنید حتی اگر آن اولین قسمت‌بندی را خراب کند؟"
-
-#~ msgid "All"
-#~ msgstr "همه"
-
-#~ msgid "TV card"
-#~ msgstr "کارت تلویزیون"
-
-#~ msgid "Boot"
-#~ msgstr "آغازگری"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "تأیید هویت"
-
-#~ msgid "Gwenview"
-#~ msgstr "Gwenview"
-
-#~ msgid "DrakVPN"
-#~ msgstr "DrakVPN"
-
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "(بسته‌های %d، %d مگابایت)"
-
-#~ msgid "%d packages"
-#~ msgstr "بسته‌های %d"
-
-#~ msgid "Language"
-#~ msgstr "زبان"
-
-#~ msgid "License"
-#~ msgstr "مجوز"
-
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "انتخاب رده‌ی نصب"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "تخمین زدن"
-
-#, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "انتخاب بسته‌ها برای نصب کردن"
-
-#~ msgid "Users"
-#~ msgstr "کاربران"
-
-#~ msgid "Networking"
-#~ msgstr "شبکه‌کاری"
-
-#~ msgid "Configure X"
-#~ msgstr "پیکربندی ایکس"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "نمی‌توان به ماژول‌های هسته مربوط به هسته‌ی شما (پرونده %s وجود ندارد) "
-#~ "دستیابی یا�ت، این معمولاً بدین معنی است که دیسکچه‌ی آغازگرتان با رسانه‌ی نصب "
-#~ "هم‌گاهی ندارد (لط�اً دیسکچه‌ی آغازگری جدیدی ایجاد کنید)"
diff --git a/perl-install/install/share/po/fi.po b/perl-install/install/share/po/fi.po
index dab6ed521..61718dd7f 100644
--- a/perl-install/install/share/po/fi.po
+++ b/perl-install/install/share/po/fi.po
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002,2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
 # Copyright (C) 2002 Mandriva
-#
+# Copyright (C) 2011 Mageia
 #
 # Matias Griese <mahagr@utu.fi>, 2001.
 # Taisto Kuikka <69319@batman.jypoly.fi>, 2003,2004.
@@ -10,54 +10,80 @@
 # Thomas Backlund <tmb@mandrake.org>, 2002, 2003, 2004, 2005.
 # Thomas Backlund <tmb@mandriva.org>, 2006, 2008.
 # Anssi Hannula <anssi@mandriva.org>, 2007, 2008.
-# Jani Välimaa <jani.valimaa@gmail.com>, 2009.
+# Jani Välimaa <wally@mandriva.org>, 2009.
+# Jani Välimaa <wally@mageia.org>, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-09-18 18:16+0300\n"
-"Last-Translator: Jani Välimaa <jani.valimaa@gmail.com>\n"
-"Language-Team: Finnish <cooker-i18n@mandrivalinux.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2011-05-21 23:25+0300\n"
+"Last-Translator: Jani Välimaa <wally@mageia.org>\n"
+"Language-Team: Finnish <mageia-i18n@mageia.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.3\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Työpöytä USB-tikulla"
+msgid "Join Us!"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Mageia Linux - 100%% vapaan lähdekoodin jakelu"
+msgid "Make it yours!"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Tutustu Linuxiin helposti Mageia One:n avulla"
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Toimistotyöasema"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Käyttäjätuella varustettu täysi Mageia Linux -jakelu"
+msgid "Home entertainment"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: jakeluja jokaisen tarpeisiin"
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
 
-#: any.pm:109
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Onko käytettävissä muita asennuksen lisälevyjä?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -70,92 +96,88 @@ msgstr ""
 "\n"
 "Onko käytettävissä muita asennusmedioita?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD/DVD-levy"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Verkko (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Verkko (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Verkko (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Peilipalvelimen osoite?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Osoitteen täytyy alkaa etuliitteellä ftp:// tai http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Otetaan yhteys Mageia Linuxin sivustolle peilipalvelinlistan hakemiseksi..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Otetaan yhteys %sin sivustolle peilipalvelinlistan hakemiseksi..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Yhteydenotto Mageia Linuxin sivustolle peilipalvelinlistan hakemiseksi "
-"epäonnistui"
+"Yhteydenotto %sin sivustolle peilipalvelinlistan hakemiseksi epäonnistui"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valitse peilipalvelin, jolta paketit haetaan"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-asetukset"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Syötä NFS-palvelimen nimi ja hakemistopolku"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Palvelimen osoite puuttuu"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Hakemistopolun täytyy alkaa \"/\"-merkillä"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS-palvelimen nimi?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Hakemisto"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Lisämedia"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -164,23 +186,90 @@ msgstr ""
 "Peilipalvelimelta ei löydy tiedostolistausta. Varmista tiedostopolun "
 "oikeellisuus."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, fuzzy, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Ohita kaikki paketit medialta \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Etsitään asennettuja paketteja..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Etsitään paketteja päivitettäväksi..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Poistetaan paketteja ennen päivitystä..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -193,87 +282,87 @@ msgstr ""
 "\n"
 "Poistetaanko paketit?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Virhe luettaessa tiedostoa %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Seuraavat levyt nimettiin uudelleen:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (ennen: %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Verkko"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Valitse media"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Tiedosto jo olemassa. Korvaa?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Ei oikeuksia"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Virheellinen NFS-nimi"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Virheellinen media %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Kuvakaappauksia ei voida ottaa ennen osiointia"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Kuvakaappaukset löytyvät asennuksen jälkeen hakemistosta %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Asennus"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Myös %s tulee alustaa"
@@ -297,22 +386,22 @@ msgstr "Käynnistetään verkkoa"
 msgid "Bringing down the network"
 msgstr "Ajetaan verkkoa alas"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Odota hetki, haetaan tiedostoa"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "median lisääminen epäonnistui"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopioidaan paketteja kovalevylle myöhempään käyttöä varten"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopioidaan"
@@ -342,7 +431,23 @@ msgstr "hyvä"
 msgid "maybe"
 msgstr "ehkä"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Medialla \"%s\" ei ole XML-tietoja, vain osittainen hakutulos paketille %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Ei kuvausta"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -351,66 +456,76 @@ msgstr ""
 "Joitakin paketin %s vaatimia paketteja ei voida asentaa:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Virhe:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Tapahtui ohittamaton virhe: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Älä kysy uudelleen"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d asennustapahtumaa epäonnistui"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Pakettien asennus epäonnistui:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Työasema"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Toimistotyöasema"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Toimisto-ohjelmistot: tekstinkäsittely (OpenOffice.org Writer, Kword), "
-"taulukkolaskenta (OpenOffice.org calc, Kspread), PDF-lukijat jne"
+"Toimisto-ohjelmistot: tekstinkäsittely (LibreOffice Writer, Kword), "
+"taulukkolaskenta (LibreOffice calc, Kspread), PDF-lukijat jne"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Peliasema"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Viihdeohjelmat: tasohyppely, korttipelit, strategia jne"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediatyöasema"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Äänen ja videon toisto- ja editointiohjelmat"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet-työasema"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -419,196 +534,196 @@ msgstr ""
 "Valikoima työkaluja sähköpostin ja uutisryhmien lukemiseen (mutt, tin...), "
 "sekä Internetin selailuun"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Verkkopääte (asiakas)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Asiakasohjelmat eri protokollille (SSH jne.)"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Työkalut, jotka helpottavat tietokoneen asetusten muokkaamista"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Komentorivityökalut"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editorit, komentotulkit, tiedostotyökalut, päätteet"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Kehitysympäristö"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 "Ohjelmat, include-tiedostot ja kehityskirjastot ohjelmointikielille C ja C++"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentaatio"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Kirjoja ja ohjeita Linuxista ja vapaan lähdekoodin ohjelmista"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 "Linux Standard Base (LSB)\n"
 " - Tuki kolmannen osapuolen ohjelmistoille"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "WWW-palvelin"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab-palvelin"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Palomuuri / Reititin"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internetin yhdyskäytävä"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Sähköposti / Uutiset"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix-sähköpostipalvelin, Inn-uutispalvelin"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Hakemisto-palvelin"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-palvelin"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS / NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "DNS- ja NIS-palvelin"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Tiedosto- ja tulostuspalvelin"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-palvelin, Samba-palvelin"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Tietokanta"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL- ja MySQL-tietokantapalvelin"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL- ja MariaDB-tietokantapalvelin"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "WWW / FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache WWW-palvelin ja Pro-ftpd FTP-palvelin"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Sähköposti"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix-sähköpostipalvelin"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL- tai MySQL-tietokantapalvelin"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL- tai MariaDB-tietokantapalvelin"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Verkkotietokone (palvelin)"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-, SMB-, SSH- ja välityspalvelin"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Graafinen ympäristö"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-työasema"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -616,12 +731,12 @@ msgid ""
 msgstr ""
 "K-työpöytäympäristö. Graafinen perusympäristö ja sen mukana tulevat työkalut"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-työasema"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -629,66 +744,127 @@ msgid ""
 msgstr ""
 "Graafinen ympäristö käyttäjäystävällisillä sovelluksilla ja työkaluilla."
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE-työasema"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Graafinen ympäristö käyttäjäystävällisillä sovelluksilla ja työkaluilla."
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME-työasema"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Työasema"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Graafinen ympäristö"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "LXDE-työpöytä"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Kevyt ja nopea, etenkin minikannettaville suunniteltu, graafinen ympäristö "
+"käyttäjäystävällisillä työkaluilla ja työpöytäsovelluksilla."
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-työpöytä"
 
-#: share/meta-task/compssUsers.pl:146
-#, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Kevyt ja nopea, etenkin minikannettaville suunniteltu, graafinen ympäristö "
 "käyttäjäystävällisillä työkaluilla ja työpöytäsovelluksilla."
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Mukautettu"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"K-työpöytäympäristö. Graafinen perusympäristö ja sen mukana tulevat työkalut"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Muut graafiset työpöytäympäristöt"
 
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:200
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, FVWM jne."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Työkalut"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-palvelin"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin etäasetuspalvelin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Verkkotyökalut ja verkon valvonta"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Valvontatyökalut, prosessienhallinta, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageian asetusvelhot"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Velhoja palvelinten asettamiseksi"
@@ -702,7 +878,7 @@ msgstr ""
 "Ilmeni virhe, eikä sitä ei voida käsitellä kunnolla.\n"
 "Jatka omalla vastuullasi."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -722,231 +898,236 @@ msgstr "Siirrytään vaiheeseen %s\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linuxin asennus %s"
+msgid "%s Installation %s"
+msgstr "%sin asennus %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> vaihtaa osaa"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "X.org-palvelin on hidas käynnistää. Odota..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Järjestelmän resurssit ovat lopussa. Mageia Linuxia asennettaessa\n"
+"Järjestelmän resurssit ovat lopussa. %sia asennettaessa\n"
 "voi ilmetä ongelmia. Jos näin tapahtuu, voidaan graafisen asennuksen\n"
 "sijaan käyttää tekstipohjaista asennusta. Tekstipohjainen asennus\n"
 "käynnistetään painamalla käynnistysruudussa näppäintä F1,\n"
 "kirjoittamalla teksti \"text\" ja painamalla Enteriä."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Asenna Mageia KDE-työpöytäympäristöllä"
+msgid "Media Selection"
+msgstr "Asennusmedioiden valinta"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Asenna Mageia GNOME-työpöytäympäristöllä"
+msgid "Install %s KDE Desktop"
+msgstr "Asenna %s KDE-työpöytäympäristöllä"
+
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Asenna %s GNOME-työpöytäympäristöllä"
 
 # Asennuksen sivuvalikko
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Mukautettu asennus"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE-työpöytä"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME-työpöytä"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Mukautettu"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "%s-työpöydän esikatselu."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Kuvaa napsauttamalla aukeaa isompi esikatselukuva."
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakettiryhmien valinta"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Yksittäisten pakettien valinta"
 
+#: steps_gtk.pm:357
+#, c-format
+msgid "Unselect All"
+msgstr "Poista valinnat"
+
 # mat
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Koko yhteensä: %d / %d Mt"
 
-#: steps_gtk.pm:403
-#, c-format
-msgid "Bad package"
-msgstr "Viallinen paketti"
-
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versio: "
 
 # mat
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Koko: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d kt\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Tärkeys: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Pakettia ei voida valita tai poistaa"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "puuttuvan riippuvuuden %s vuoksi"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "täyttämättömistä riippuvuuksista %s johtuen"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "yritetään asentaa %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "jotta %s voitaisiin säilyttää"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Pakettia ei voida asentaa, koska levyllä ei ole tarpeeksi tilaa sen "
 "asentamiseen"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Seuraavat paketit asennetaan"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Seuraavat paketit poistetaan"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Tämä on pakollinen paketti, sitä ei voida poistaa valinnoista"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Paketin valintaa ei voi poistaa, koska se on jo asennettu"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Paketin valintaa ei voi poistaa, koska se pitää päivittää"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Näytä automaattisesti valitut paketit"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Asenna"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Lataa / tallenna pakettivalinnat"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Päivitetään pakettien valintoja"
 
 # Asennuksen sivuvalikko
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Vähimmäisasennus"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Ohjelmistojen hallinta"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Valitse asennettavat paketit"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Asennus käynnissä"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Ei yksityiskohtia"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Aikaa jäljellä:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(arvioidaan...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
@@ -954,27 +1135,22 @@ msgstr[0] "%d paketti"
 msgstr[1] "%d pakettia"
 
 # Asennuksen sivuvalikko
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Aseta"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "ei asetettu"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Asennusmedioiden valinta"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -983,84 +1159,84 @@ msgstr ""
 "Löydettiin seuraavat asennusmediat.\n"
 "Poista median valinta, jos et halua käyttää sitä."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Asennuslevyjen sisältö on mahdollista kopioida kovalevylle ennen asennusta.\n"
 "Asennus jatkuu tämän jälkeen kovalevyltä ja paketit ovat käytettävissä myös "
 "asennuksen jälkeen."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopioi asennuslevyt"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Ilmeni virhe"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Valitse näppäimistöasettelu"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Lista kaikista käytettävissä olevista näppäimistöistä:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Asennustapa"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Asennus vai päivitys?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Asennus"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Päivitä %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Salausavain %s:lle"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Peruuta asennus ja käynnistä järjestelmä uudelleen"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Uusi asennus"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Päivitä edellinen asennus (ei suositella)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1068,45 +1244,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Nykyistä Mageia Linux -asennusta ei voida päivittää turvallisesti\n"
-"versioon %s.\n"
+"Asennusohjelma havaitsi, että asennettua Linux-järjestelmää ei voida\n"
+"päivittää turvallisesti versioon %s.\n"
 "\n"
 "On suositeltavaa suorittaa asennus, joka korvaa edellisen asennuksen.\n"
 "\n"
 "HUOM! Ota varmuuskopio tärkeistä ja henkilökohtaisista tiedostoista\n"
 "ennen kuin valitset \"Uusi asennus\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Etsitään IDE-levyjä"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"1 Mt:n käynnistyslohkoa varten ei löydy vapaata tilaa! Asennusta jatketaan, "
-"mutta käynnistyslohko-osio pitää luoda DiskDrakella järjestelmän "
-"käynnistämiseksi."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"PPC PReP Boot bootstrap täytyy luoda! Asennusta jatketaan, mutta "
-"käynnistyslohko-osio pitää luoda DiskDrakella järjestelmän käynnistämiseksi."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1120,12 +1276,12 @@ msgstr ""
 "Jos levyä ei ole, valitse \"Peruuta\" ohittaaksesi asennukset kyseiseltä "
 "levyltä."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Etsitään saatavilla olevia paketteja..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1134,7 +1290,7 @@ msgstr ""
 "Järjestelmässä ei ole riittävästi vapaata tilaa asennusta tai päivitystä "
 "varten (%dMt > %dMt)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1143,53 +1299,53 @@ msgstr ""
 "Lataa tai tallenna pakettien valinta.\n"
 "Muotoilu on sama kuin auto_install-toiminnon luomilla tiedostoilla."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Lataa"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Tallenna"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Virheellinen tiedosto"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Työpöydän valinta"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Valitse asennettava työpöytäympäristö."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 "Valittujen pakettien koko on suurempi kuin käytettävissä oleva levytila"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Asennuksen tyyppi"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1198,87 +1354,111 @@ msgstr ""
 "Yhtään pakettiryhmää ei ole valittu.\n"
 "Valitse haluttu vähimmäisasennus:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Graafisella käyttöliittymällä"
 
-#: steps_interactive.pm:583
-#, c-format
-msgid "Install suggested packages"
+#: steps_interactive.pm:579
+#, fuzzy, c-format
+msgid "Install recommended packages"
 msgstr "Asenna ehdotetut paketit"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Perusdokumentaation kanssa (suositeltu!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Vähimmäisasennus (ei edes urpmi:a)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Valmistellaan käynnistyslatainta..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Valmistellaan asennusta"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Asennetaan pakettia %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Paketteja järjestettäessä tapahtui virhe:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Jatka?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Yritä uudelleen"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Ohita paketti"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Ohita kaikki paketit medialta \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Siirry takaisin medioiden ja pakettien valintaan"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Paketin %s asentamisessa tapahtui virhe."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Asennuksen jälkeiset toiminnot"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Varmista, että \"Update Modules\"-media on asemassa %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Päivitykset"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1298,28 +1478,29 @@ msgstr ""
 "\n"
 "Asennetaanko päivitykset?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s kohteessa %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Laitteisto"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Äänikortti"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Onko koneessa ISA-väylään liitettävä äänikortti?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1328,83 +1509,71 @@ msgstr ""
 "Suorita asennuksen jälkeen komento \"alsaconf\" tai \"sndconfig\" "
 "asettaaksesi äänikortin."
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Yhtään äänikorttia ei löytynyt. Suorita asennuksen jälkeen komento "
 "\"harddrake2\"."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Graafinen käyttöliittymä"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Verkko ja Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Välityspalvelimet"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "asetettu"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Turvallisuustaso"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Palomuuri"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktivoitu"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "ei käytössä"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "X-palvelinta ei ole asetettu, haluatko varmasti jättää sen asettamatta?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Valmistellaan käynnistyslatainta..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Valmistellaan asennusta"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Ole kärsivällinen, valmistelussa voi kestää hetki..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Tietokone on vanhanaikainen tai tuntematon, joten Yaboot-käynnistyslatain ei "
-"toimi. Asennus jatkuu, mutta koneen käynnistämiseen täytyy käyttää BootX:ää "
-"tai jotain muuta keinoa. Ytimen parametrit root-tiedostojärjestelmälle ovat "
-"root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1414,17 +1583,17 @@ msgstr ""
 "pääkäyttäjälle."
 
 # mat
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Aseta tyhjä levyke levykeasemaan %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Luodaan automaattiasennuslevykettä..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1435,12 +1604,12 @@ msgstr ""
 "\n"
 "Haluatko todella lopettaa?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Onnittelut"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Käynnistä uudelleen"
@@ -1536,13 +1705,6 @@ msgid ""
 "Users"
 msgstr "Käyttäjät"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Verkko"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1587,6 +1749,84 @@ msgid ""
 "Exit"
 msgstr "Lopetus"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Valmistellaan käynnistyslatainta..."
+
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Kevyt ja nopea, etenkin minikannettaville suunniteltu, graafinen "
+#~ "ympäristö käyttäjäystävällisillä työkaluilla ja työpöytäsovelluksilla."
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Mukautettu"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "1 Mt:n käynnistyslohkoa varten ei löydy vapaata tilaa! Asennusta "
+#~ "jatketaan, mutta käynnistyslohko-osio pitää luoda DiskDrakella "
+#~ "järjestelmän käynnistämiseksi."
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "PPC PReP Boot bootstrap täytyy luoda! Asennusta jatketaan, mutta "
+#~ "käynnistyslohko-osio pitää luoda DiskDrakella järjestelmän "
+#~ "käynnistämiseksi."
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Tietokone on vanhanaikainen tai tuntematon, joten Yaboot-käynnistyslatain "
+#~ "ei toimi. Asennus jatkuu, mutta koneen käynnistämiseen täytyy käyttää "
+#~ "BootX:ää tai jotain muuta keinoa. Ytimen parametrit root-"
+#~ "tiedostojärjestelmälle ovat root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Tervetuloa"
+
+#~ msgid "Select All"
+#~ msgstr "Valitse kaikki"
+
+#~ msgid "Bad package"
+#~ msgstr "Viallinen paketti"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Valmistellaan käynnistyslatainta..."
+
+#~ msgid "Mageia, the new Linux distribution"
+#~ msgstr "Mageia, uusi Linux-jakelu"
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Verkko"
+
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Työpöytä USB-tikulla"
+
+#~ msgid "The 100%% open source Mageia distribution"
+#~ msgstr "Mageia - 100%% vapaan lähdekoodin jakelu"
+
+#~ msgid "Explore Linux easily with Mageia One"
+#~ msgstr "Tutustu Linuxiin helposti Mageia One:n avulla"
+
+#~ msgid "A full Mageia desktop, with support"
+#~ msgstr "Käyttäjätuella varustettu täysi Mageia -jakelu"
+
+#~ msgid "Mageia: distributions for everybody's needs"
+#~ msgstr "Mageia: jakeluja jokaisen tarpeisiin"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1670,7 +1910,7 @@ msgstr "Lopetus"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/fr.po b/perl-install/install/share/po/fr.po
index 1e6d89140..0dd17d50a 100644
--- a/perl-install/install/share/po/fr.po
+++ b/perl-install/install/share/po/fr.po
@@ -1,123 +1,83 @@
-# translation of DrakX-fr.po to Français
-# Translation file of Mandriva Linux graphic install
-# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006 Mandriva
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Veuillez ne pas mettre à jour ce fichier à moins d'être
-# certain tant de vos traductions que de votre grammaire et
-# de votre orthographe. Ces dernières sont trop souvent
-# approximatives. Elles nécessitent alors des relectures et
-# des corrections qui n'ont d'autre conséquence que de faire
-# perdre du temps à tout le monde (à vous si votre travail est
-# imparfait et aux relecteurs qui doivent rechercher puis corriger
-# vos éventuelles fautes).
-#
-# VEUILLEZ RESPECTER LA TYPOGRAPHIE FRANÇAISE !
-# Les majuscules doivent être accentuées si besoin est. Respectez
-# les espaces nécessaires pour la ponctuation (espace après la virgule et
-# le point, espace insécables avant les points d'interrogation,
-# d'exclamation, les deux-points et le point virgule, espace aussi après
-# le point virgule).
-# N'enlevez pas l'espace qui suit un signe de ponctuation en fin de
-# phrase; vous devez respecter la version originale.  Dans ce type de
-# cas, il est extrèmement probable que le programme va afficher
-# quelque chose d'autre à la fin.  En enlevant l'espace, vous allez
-# accoller deux mots.
-#
-# ESPACES INSÉCABLES
-# Vous devez utiliser un espace insécable (c'est un espace qui ne peut
-# pas servir de rupture à la ligne) avant le point d'exclamation, le
-# point d'interrogation, le deux-points, le point virgules, et pour les
-# "quantités", entre le nombre et l'unité abbrégée (par exemple "10 g").
-# L'espace normal en ISO et UTF8 est le caractere 0x20 tandis que l'espace
-# insécable est le caractère 0xA0. Sous Emacs en utilisant le po mode
-# livré avec gettext >= 0.10.40-4mdk vous pouvez voir celui-ci avec un
-# fond de couleur spécial. Sous Vi celui-ci est normalement affiché
-# précédé du caractère pipe "|". Pour le taper sous la plupart des
-# éditeurs, vous pouvez utiliser la touche "Compose" puis en tapant
-# deux espaces. Si vous n'avez pas de touche compose, vous pouvez
-# donner cette fonction à la touche "Windows" droite de votre clavier
-# avec la commande suivante :
-#   xmodmap -e 'keycode 116 = Multi_key'
-#
-# Les guillemets françaises sont « et » et non ". La guillemet ouvrante
-# « est suivie d'un espace insécable et la guillemet fermante » est
-# précédée du même type d'espace. Pour le taper, vous pouvez utiliser
-# la combinaison Compose < <, et Compose > > (ou alt-z et alt-x).
-#
-# Enfin, traduisez INTELLIGEMMENT et non mot à mot. Certaines traductions
-# n'ont aucun sens en français.
-#
-# MOTS À ÉVITER
-#  - application. Ce terme n'étant pas compris par le grand public, il est
-#    préférable de le remplacer par le mot "programme".
-#
-# Nous vous remercions de votre compréhension.
-#
-#
-#
-# Stéphane Teletchéa, 2005.
-# David BAUDENS <baudens@mandriva.com>, 1999-2004.
-# David ODIN <odin@mandriva.com>, 2000.
-# Pablo Saratxaga <pablo@mandriva.com>, 2001, 2005.
-# KAtiOS <katios@nolabel.net>, 2001.
-# Guillaume Cottenceau <gc@mandriva.com>, 2001-2002.
-# Thierry Vignaud <tvignaud@mandriva.com>, 2001-2004.
-# Christophe Combelles <ccomb@free.fr>, 2002,2003.
-# Adrien REZER <monsieurdidi@free.fr>, 2003.
-# RICHARD Nicolas <richardnicolas22@yahoo.fr>, 2004.
-# Lecureuil Nicolas <n1c0l4s.l3@wanadoo.fr>, 2004.
-# Teletchéa <steletch@free.fr>, 2004, 2005.
-# Christophe Berthelé <cpjc@free.fr>, 2005, 2006, 2007, 2008, 2009.
-# Didier Hérisson <didier.herisson@angstrom.uu.se>, 2005.
-# Nicolas Lécureuil <neoclust@mandriva.org>, 2005.
-# Christophe Berthelé <berthy@mandriva.org>, 2009.
+# Translators:
+# Eric Barbero <dune06@free.fr>, 2013
+# Eric Barbero <dune06@free.fr>, 2013,2015
+# Yves Brungard, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-fr\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-09-26 10:55+0200\n"
-"Last-Translator: Christophe Berthelé <berthy@mandriva.org>\n"
-"Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 20:01+0000\n"
+"Last-Translator: Eric Barbero <dune06@free.fr>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
+"fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2;plural=(n>1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Votre Bureau sur une clé USB"
+msgid "Join Us!"
+msgstr "Rejoignez-nous !"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "La distribution Mageia Linux 100%% open source"
+msgid "Make it yours!"
+msgstr "Pour vous !"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Explorez Linux facilement avec Mageia One"
+msgid "Your choice!"
+msgstr "Votre choix !"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Un Bureau Mageia Linux complet, avec support"
+msgid "Office tools"
+msgstr "Pour la bureautique !"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia : des distributions pour les besoins de chacun"
+msgid "Home entertainment"
+msgstr "Pour vos loisirs !"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Pour les enfants !"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Pour toute la famille !"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Pour les développeurs !"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Merci !"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Soyez libre !"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Possédez-vous d'autres média supplémentaires ?"
+msgstr "Possédez-vous d'autres médias supplémentaires ?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -125,124 +85,197 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
-"Les média suivants ont été trouvés et seront utilisés pendant "
+"Les médias suivants ont été trouvés et seront utilisés pendant "
 "l'installation : %s.\n"
 "\n"
 "\n"
 "Souhaitez-vous configurer un autre média d'installation ?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Réseau (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Réseau (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Réseau (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL du miroir ?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "L'URL doit commencer par ftp:// ou http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Connexion au site Web de Mageia Linux pour obtenir la liste des serveurs "
-"miroirs disponibles..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Récupération de la liste des miroirs disponibles sur le site Web %s…"
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Échec de la connexion au site web de Mageia Linux pour obtenir la liste des "
-"miroirs disponibles"
+"La tentative de récupération de la liste des miroirs disponibles sur le site "
+"Web %s a échoué"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Choisissez un serveur miroir d'où télécharger les paquetages"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Configuration NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
-msgstr "Veuillez entrer le nom de machine et le répertoire de votre média NFS"
+msgstr "Veuillez entrer le nom d'hôte et le répertoire de votre média NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
-msgstr "Le nom d'hôte manque"
+msgstr "Il manque le nom d'hôte"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Le répertoire doit commencer par « / »"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Nom d'hôte du montage NFS ?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Répertoire"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Supplémentaire"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
-"Ne peut trouver le fichier de liste de paquets sur ce miroir. Vérifiez que "
-"l'emplacement est correct."
+"Ne peut trouver le fichier de liste des paquetages sur ce miroir. Vérifiez "
+"que l'emplacement est correct."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Certains matériels sur votre machine peuvent nécessiter des firmwares non\n"
+"libres afin que les pilotes libres puissent fonctionner."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Vous devriez activer « %s »"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+"« %s » contient les différentes parties du système ainsi que ses applications"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "« %s » contient des logiciels non libres.\n"
+
+#: any.pm:477
+#, 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 ""
+"Il contient également des firmwares nécessaires au bon fonctionnement de "
+"certains périphériques (ex : certaines cartes ATI/AMD, certaines cartes "
+"réseau, certaines cartes RAID, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"« %s » contient des logiciels qui ne peuvent pas être redistribués dans tous "
+"les pays à cause de certains brevets logiciels."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"Il contient également des logiciels de « %s » recompilés avec des "
+"fonctionnalités supplémentaires."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Ici vous pouvez activer des médias supplémentaires si vous le désirez."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Ce médium fournit les paquets de mise à jour pour le médium « %s »"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
-msgstr "Recherche des paquetages déjà installés..."
+msgstr "Recherche des paquetages déjà installés…"
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
-msgstr "Recherche des paquetages à mettre à jour..."
+msgstr "Recherche des paquetages à mettre à jour…"
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
-msgstr "Suppression des paquetages avant la mise à jour ..."
+msgstr "Suppression des paquetages avant la mise à jour…"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -256,87 +289,87 @@ msgstr ""
 "\n"
 "Souhaitez-vous réellement les désinstaller ?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erreur lors de la lecture du fichier %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Les disques suivants ont été renommés :"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (précédemment nommé %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Réseau"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Veuillez choisir un média"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Le fichier existe déjà. Voulez-vous l'écraser ?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Mauvais nom NFS"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Média %s incorrect"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Impossible de faire des captures d'écran avant le partitionnement"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Les captures d'écran seront disponibles après l'installation dans %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Installation"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configuration"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Vous devez aussi formater %s"
@@ -347,37 +380,37 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"Certains périphériques présents sur votre système nécessitent des\n"
-"pilotes « propriétaires » pour pouvoir fonctionner. Vous pouvez\n"
-"trouver plus d'informations les concernant ici : %s"
+"Certains périphériques présents sur votre système requièrent des pilotes "
+"« propriétaires » pour pouvoir fonctionner.\n"
+"Vous pouvez trouver plus d'informations les concernant ici : %s"
 
 #: interactive.pm:22
 #, c-format
 msgid "Bringing up the network"
-msgstr "Démarrage de l'interface réseau..."
+msgstr "Démarrage de l'interface réseau"
 
 #: interactive.pm:27
 #, c-format
 msgid "Bringing down the network"
-msgstr "Arrêt de l'interface réseau..."
+msgstr "Arrêt de l'interface réseau"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Veuillez patienter, récupération du fichier en cours"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "impossible d'ajouter le média"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 "Copie de certains paquetages sur les disques pour une utilisation future"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Copie en cours"
@@ -407,7 +440,24 @@ msgstr "utile"
 msgid "maybe"
 msgstr "éventuellement"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Récupération des informations depuis les métadonnées XML…"
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Pas d'info xml pour le média « %s », seulement un résultat partiel pour le "
+"paquetage %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Pas de description"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -416,277 +466,287 @@ msgstr ""
 "Certains paquetages requis par %s ne peuvent être installés :\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Une erreur est survenue :"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Une erreur fatale est survenue : %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Ne plus me demander"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transactions ont échoué"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
-msgstr "L'installation des paquets a échoué :"
+msgstr "L'installation des paquetages a échoué :"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Station de travail"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Poste bureautique"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programmes pour la bureautique : traitements de texte (OpenOffice.org "
-"Writer, Kword), tableurs (OpenOffice.org Calc, Kspread), visualiseur PDF, etc"
+"Programmes pour la bureautique : traitements de texte (LibreOffice Writer, "
+"Kword), tableurs (LibreOffice Calc, Kspread), visualiseur PDF, etc"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Jeux"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 "Programmes de divertissement : jeux d'arcade, de plateau, de stratégie, etc"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimédia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
-msgstr "Programmes pour jouer/éditer du son et de la vidéo"
+msgstr "Programmes de lecture/édition du son et de la vidéo"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 "Ensemble d'outils pour lire et envoyer des courriers électroniques et des "
-"messages de forums (mutt, tin, ...), ainsi que pour naviguer sur Internet"
+"messages de forums (mutt, tin, …), ainsi que pour naviguer sur Internet"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Ordinateur réseau (client)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients pour différents protocoles, dont ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Outils pour faciliter la configuration de votre ordinateur"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Utilitaires console"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Éditeurs, interpréteurs, outils fichiers, terminaux"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Développement"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 "Bibliothèques de développement C et C++, programmes et fichiers d'en-tête"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentation"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livres et Howto's sur Linux et le Logiciel Libre"
+msgstr "Livres et tutoriels sur Linux et le Logiciel Libre"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "« Linux Standard Base ». Support des programmes tiers"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Serveur Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
-msgstr "Groupware"
+msgstr "Logiciel de groupe de travail"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Serveur Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Pare Feu/Routeur"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
-msgstr "Passerelle internet"
+msgstr "Passerelle Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Courriel/Nouvelles"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Serveur de courrier Postfix, serveur de nouvelles lnn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Serveur d'annuaire"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Serveur FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
-msgstr "Serveur de noms de domaine et d'information réseaux"
+msgstr "Serveur de nom de domaine et d'information réseau"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Serveur pour partage de fichiers et d'imprimantes"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Serveur NFS, Serveur Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
-msgstr "Base de Données"
+msgstr "Base de données"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Serveur de bases de données PostgreSQL et MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
-msgstr "Apache et Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Courriel"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Serveur de courrier Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Serveur de bases de données PostgreSQL ou MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
-msgstr "Serveur réseau"
+msgstr "Serveur d'ordinateur réseau"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Serveur NFS, serveur SMB, serveur Proxy (mandataire), serveur SSH"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Environnement graphique"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Station de travail KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
-"L'environnement graphique KDE (K Desktop Environment) avec sa collection "
-"d'outils"
+"L'environnement de bureau graphique KDE (K Desktop Environment) avec sa "
+"collection d'outils"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Station de travail GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -695,66 +755,125 @@ msgstr ""
 "Un environnement de bureau avec un ensemble de programmes et d'outils "
 "intuitifs"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Station de travail XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Un environnement de bureau plus léger avec un ensemble de programmes et "
+"d'outils intuitifs"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Station de travail MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Station de travail Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Un environnement de bureau basé sur GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Bureau LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Un portage vers Qt de l'environnement de bureau léger"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Station de travail Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Un bureau rapide et léger avec une suite d'outils dédiés"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Bureau LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Un environnement graphique léger et rapide"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Bureau Plasma"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Un environnement de bureau léger et rapide avec un ensemble de programmes et "
-"d'outils intuitifs"
+"Le bureau Plasma Desktop, l'environnement graphique de base avec une "
+"collection d'outils en accompagnement"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
-msgstr "Autres Environnements de Bureau"
+msgstr "Autres environnements de bureau"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, etc."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilitaires"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Serveur SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Serveur de configuration distante Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Utilitaires réseau/Surveillance du réseau"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
-msgstr "Outils de surveillance, gestion de processus, tcpdump, nmap, ..."
+msgstr "Outils de surveillance, gestion des processus, tcpdump, nmap, …"
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Assistants Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Assistants pour configurer le serveur"
@@ -768,7 +887,7 @@ msgstr ""
 "Une erreur est survenue et semble difficile à résoudre correctement.\n"
 "Vous pouvez continuer, mais à vos risques et périls."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -776,11 +895,10 @@ msgid ""
 "Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
 msgstr ""
-"Quelques paquetages importants n'ont pas été correctement installés. Il se\n"
-"peut que le lecteur de CD-ROM ou le CD-ROM lui-même soit défectueux. Vous\n"
-"pouvez vous assurer du bon état de ce dernier en exécutant la commande "
-"suivante\n"
-"sur un ordinateur fonctionnant correctement : « rpm -qpl media/main/*.rpm »\n"
+"Quelques paquetages importants n'ont pas été correctement installés.\n"
+"Il se peut que le lecteur de CD-ROM ou le CD-ROM lui-même soit défectueux.\n"
+"Vous pouvez vous assurer du bon état de ce dernier en exécutant la commande "
+"suivante sur un ordinateur fonctionnel : « rpm -qpl media/main/*.rpm »\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
@@ -789,341 +907,343 @@ msgstr "Démarrage de l'étape « %s »\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Installation de Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "%s Installation %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> entre éléments"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
-msgstr "Le serveur Xorg est lent à démarrer. Veuillez patienter..."
+msgstr "Le serveur Xorg est lent à démarrer. Veuillez patienter…"
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Votre ordinateur dispose de ressources limitées. Vous pouvez rencontrer\n"
-"des problèmes lors de l'installation de Mageia Linux. Dans ce cas, vous\n"
-"pouvez essayer l'installation en mode texte. Pour cela, appuyez sur la "
-"touche\n"
-"« F1 » après l'amorçage sur CD-ROM puis entrez « text »."
+"Les ressources de votre système sont limitées. Vous pouvez rencontrer des "
+"problèmes\n"
+"lors de l'installation de %s. Si c'est le cas, vous pouvez essayer une "
+"installation en mode texte.\n"
+"Pour cela, appuyez sur « F1 » lors du démarrage sur le CD-ROM, puis entrez « "
+"text »."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Installer le bureau KDE de Mageia"
+msgid "Media Selection"
+msgstr "Sélection des médias"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Installer le bureau GNOME de Mageia"
+msgid "Install %s KDE Desktop"
+msgstr "Installer le bureau KDE %s"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Installer le bureau GNOME %s"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Installation personnalisée"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Bureau KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Bureau GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Bureau personnalisé"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Voici un aperçu du bureau « %s »."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
-msgstr "Veuillez cliquer sur l'image afin d'agrandir l'aperçu"
+msgstr "Cliquez sur l'image afin d'agrandir l'aperçu"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Sélection des groupes de paquetages"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Sélection individuelle des paquetages"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Taille totale : %d / %d Mo"
+msgid "Unselect All"
+msgstr "Désélectionner tout"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Mauvais paquetage"
+msgid "Total size: %d / %d MB"
+msgstr "Taille totale : %d / %d Mo"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Version : "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Taille : "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d Ko\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Importance : "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Vous ne pouvez pas sélectionner/désélectionner ce paquetage"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "parce que %s manque"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "car %s n'est pas résolu"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
-msgstr "Tentative de promouvoir %s"
+msgstr "tentative de promouvoir %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "afin de conserver %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
-msgstr "Il n'y a pas assez de place pour installer ce paquetage"
+msgstr ""
+"Il n'y a pas assez d'espace disque disponible pour installer ce paquetage"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Les paquetages suivants vont être installés"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Les paquetages suivants vont être désinstallés"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ce paquetage est nécessaire, vous ne pouvez pas le désélectionner"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Vous ne pouvez pas désélectionner ce paquetage. Il est déjà installé"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr ""
-"Vous ne pouvez pas désélectionner ce paquetage, il doit être mis à jour."
+"Vous ne pouvez pas désélectionner ce paquetage, car il doit être mis à jour"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Montrer les paquetages sélectionnés automatiquement"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Installation"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Charger/Sauvegarder la sélection"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Mise à jour de la sélection des paquetages"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Installation minimale"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
-msgstr "Gestion des paquetages"
+msgstr "Gestion des logiciels"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Choisissez les paquetages que vous voulez installer"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installation"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Pas de détails"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Temps restant :"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
-msgstr "(estimation en cours...)"
+msgstr "(estimation en cours…)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d paquetage"
 msgstr[1] "%d paquetages"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Résumé"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configurer"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "non configuré"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Sélection des média"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
-"Les média d'installation suivants ont été trouvés.\n"
+"Les médias d'installation suivants ont été trouvés.\n"
 "Si vous ne désirez pas utiliser certains d'entre eux, vous pouvez les "
 "désélectionner maintenant."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
-"Vous avez la possibilité de copier le contenu des CDs sur le disque dur "
-"avant l'installation.\n"
+"Vous avez la possibilité de copier le contenu des CD sur le disque dur avant "
+"l'installation.\n"
 "Celle-ci s'effectuera alors à partir du disque dur et les paquetages "
 "resteront disponibles une fois le système installé."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
-msgstr "Copier entièrement les CDs"
+msgstr "Copier entièrement les CD"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Une erreur est survenue"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
-msgstr "Veuillez choisir votre type de clavier"
+msgstr "Veuillez choisir votre disposition de clavier"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Voici la liste complète des claviers disponibles :"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installation/Mise à jour"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Désirez-vous faire une installation ou une mise à jour ?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installation"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Mettre à jour %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clé de chiffrement pour %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Annuler l'installation, relancer le système"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Nouvelle installation"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
-msgstr "Mettre à jour la précédente installation (non recommandé)"
+msgstr "Mettre à jour l'installation précédente (non recommandé)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1131,50 +1251,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"L'assistant d'installation a détecté que votre système Mageia installé\n"
+"L'assistant d'installation a détecté que votre système Linux installé\n"
 "ne peut être migré vers %s en toute sécurité.\n"
 "\n"
 "Une nouvelle installation remplaçant l'ancienne est recommandée.\n"
 "\n"
-"Attention, vous devriez sauvegarder vos informations personnelles\n"
+"Attention, vous devriez sauvegarder vos données personnelles\n"
 "avant de choisir « Nouvelle installation »."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Configuration IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Pas de place libre pour la partition d'amorçage (bootstrap) de 1 Mo."
-"L'installation va\n"
-"continuer, mais pour que votre système puisse démarrer, vous aurez besoin "
-"de\n"
-"créer la partition d'amorçage avec DiskDrake."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Pas de place libre pour la partition d'amorçage (PPC PReP Boot bootstrap) de "
-"1 Mo.L'installation va\n"
-"continuer, mais pour que votre système puisse démarrer, vous aurez besoin "
-"de\n"
-"créer la partition d'amorçage avec DiskDrake."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1188,76 +1283,76 @@ msgstr ""
 "Si vous ne le possédez pas, cliquez sur « Annuler » afin de ne rien "
 "installer à partir de ce CD-ROM."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
-msgstr "Recherche des paquetages disponibles..."
+msgstr "Recherche des paquetages disponibles…"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
-"Votre système n'a pas assez d'espace libre pour installer ou de mettre à "
+"Votre système n'a pas assez d'espace libre pour l'installation ou la mise à "
 "jour (%dMo > %dMo)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"Veuillez choisir entre le chargement ou la sauvegarde de la\n"
-"sélection des paquetages. Le format est le même que celui de l'installation "
-"automatisée (auto_install)."
+"Veuillez choisir entre le chargement ou la sauvegarde de la sélection des "
+"paquetages.\n"
+"Le format est le même que celui de l'installation automatisée (auto_install)."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Charger"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Mauvais fichier"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Sélection du bureau"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
-msgstr "Vous pouvez choisir un profil de bureau de station de travail ."
+msgstr "Vous pouvez choisir un profil de bureau de station de travail."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "La taille sélectionnée est plus importante que la place disponible"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Type d'installation"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1266,88 +1361,115 @@ msgstr ""
 "Vous n'avez sélectionné aucun groupe de paquetages.\n"
 "Veuillez choisir l'installation minimale désirée :"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Avec X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Installer les paquetages suggérés"
+msgid "Install recommended packages"
+msgstr "Installer les paquetages recommendés"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Avec la documentation de base (recommandé !)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Installation vraiment minimale (et en particulier pas d'urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Préparation de la mise à jour"
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Préparation de l'installation"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Installation du paquetage %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Erreur lors du tri des paquetages :"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Souhaitez-vous tout de même continuer ?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Ré-essayer"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Ignorer ce paquetage"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Ignorer tous les paquetages du média « %s »"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Retourner à la sélection du média et des paquetages"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Erreur lors de l'installation du paquetage %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuration post-installation"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
-"Assurez vous que le média de mise à jour des modules est dans le lecteur %s"
+"Assurez-vous que le média de mise à jour des modules est dans le lecteur %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Mises à jour"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Maintenant vous pouvez paramétrer le média en ligne."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Ceci vous permet d'installer les mises à jour de sécurité."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Pour paramétrer ces médias, vous devez disposer d'une connexion Internet.\n"
+"\n"
+"Voulez-vous paramétrer le média de mise à jour ?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1359,37 +1481,38 @@ msgid ""
 "\n"
 "Do you want to install the updates?"
 msgstr ""
-"Vous avez maintenant la possibilité de télécharger les mises à jour\n"
-"créées depuis la sortie de cette distribution. Il peut y avoir des "
-"correctifs de\n"
+"Vous avez maintenant la possibilité de télécharger les paquetages mis à "
+"jour\n"
+"depuis la sortie de cette distribution. Il peut y avoir des correctifs de\n"
 "sécurité ou des résolutions d'anomalies.\n"
 "\n"
-"Vous devez avoir une connexion internet pour les télécharger.\n"
+"Vous devez avoir une connexion Internet pour les télécharger.\n"
 "\n"
 "Souhaitez-vous installer les mises à jour ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s sur %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Matériel"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Carte son"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Possédez-vous une carte son ISA ?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1398,85 +1521,71 @@ msgstr ""
 "Lancez « alsaconf » ou « sndconfig » après l'installation pour configurer la "
 "carte son"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Aucune carte son détectée. Essayez avec « harddrake » après l'installation"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interface graphique"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Réseau et Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
-msgstr "Proxys"
+msgstr "Proxies (serveurs mandataires)"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "configuré"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Niveau de sécurité"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
-msgstr "Pare Feu"
+msgstr "Pare-feu"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "activé"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "désactivé"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
-"Vous n'avez pas configuré le serveur d'affichage (X11). Êtes-vous sûr de ce "
-"que vous faites ?"
+"Vous n'avez pas configuré le serveur d'affichage X. Êtes-vous sûr que c'est "
+"ce que vous désirez ?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Préparation du programme d'amorçage..."
+msgid "Preparing initial startup program..."
+msgstr "Préparation du chargeur d'amorçage..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
-msgstr "Merci d'être patient, cela peut prendre quelques minutes..."
-
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Il semble que votre machine ne soit pas dotée de l'architecture "
-"« NewWorld ».\n"
-"Le programme d'amorçage « yaboot » ne fonctionnera pas.\n"
-"L'installation va continuer, mais vous aurez besoin de « BootX » ou\n"
-"d'une autre méthode pour démarrer votre machine. Le paramètre pour la racine "
-"du noyau est : root=%s"
+msgstr "Merci d'être patient, cela peut prendre quelques minutes…"
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1485,17 +1594,17 @@ msgstr ""
 "A ce niveau de sécurité, l'accès aux fichiers de la partition Windows sera "
 "restreint à l'administrateur."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Insérez une disquette vierge dans le lecteur %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
-msgstr "Création de la disquette d'auto-installation..."
+msgstr "Création de la disquette d'auto-installation…"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1506,12 +1615,12 @@ msgstr ""
 "\n"
 "Souhaitez-vous vraiment quitter maintenant ?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Félicitations"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Redémarrage"
@@ -1606,13 +1715,6 @@ msgid ""
 "Users"
 msgstr "Utilisateurs"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Réseau"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1654,10 +1756,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Quitter"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programmes pour la bureautique : traitements de texte (kword, abiword), "
-#~ "tableurs (kspread, gnumeric), visualiseur PDF, etc"
diff --git a/perl-install/install/share/po/fur.po b/perl-install/install/share/po/fur.po
index 3ff051e45..8dba6e916 100644
--- a/perl-install/install/share/po/fur.po
+++ b/perl-install/install/share/po/fur.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2004-06-28 17:41+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -16,38 +16,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -56,112 +81,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, fuzzy, c-format
 msgid "Network (HTTP)"
 msgstr "Rêt"
 
-#: any.pm:122
+#: any.pm:164
 #, fuzzy, c-format
 msgid "Network (FTP)"
 msgstr "Rêt"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Cartele"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -170,87 +260,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr ""
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr ""
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "HFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rêt"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Par plasè sielç"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr ""
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permès dineât"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "font zontade %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr ""
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "Instale"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configurazion"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr ""
@@ -272,22 +362,22 @@ msgstr ""
 msgid "Bringing down the network"
 msgstr ""
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Instalazion in vore"
@@ -317,340 +407,422 @@ msgstr ""
 msgid "maybe"
 msgstr ""
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, fuzzy, c-format
+msgid "No description"
+msgstr "tes descrizions"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Al è intravignût un fal"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "A si è verificât un fal fatâl: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Instalazion falade"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instale atualizazions"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "Viôt le Configurazion"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"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:26
 #, c-format
 msgid "Game station"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Multimedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "Internazionalizazion"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, 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:42
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Informatiche"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, fuzzy, c-format
 msgid "Console Tools"
 msgstr "Console"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Svilup"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentazion"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Server Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "Grop"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Kolab Server"
 msgstr "Server Web"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/File/_Gnûf"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Ferme Server"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "Server NTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, fuzzy, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
+msgid "PostgreSQL and MariaDB Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Mail"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
+msgid "PostgreSQL or MariaDB database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Informatiche"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambient Grafic"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, 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:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "Viôt le Configurazion"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Viôt le Configurazion"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Viôt le Configurazion"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Ambient Grafic"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "Desktop"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Desktop"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Ambient Grafic"
+
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Desktop"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, fuzzy, c-format
 msgid "Other Graphical Desktops"
 msgstr "Desktop grafic"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, fuzzy, c-format
 msgid "Utilities"
 msgstr "Filipinis"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Viôt le Configurazion"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "<b>Mageia Expert</b>"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr ""
@@ -664,7 +836,7 @@ msgstr ""
 "Al è intravignût un fal, ma no sai ben cemût gjestîlu.\n"
 "Continue a to azard."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -680,328 +852,328 @@ msgstr ""
 
 #: steps_curses.pm:22
 #, fuzzy, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Centri di Control Mageia Linux"
+msgid "%s Installation %s"
+msgstr "Centri di Control %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr ""
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Selezion dal percors"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr ""
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "Desktop"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "Desktop"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "Desktop"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr ""
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr ""
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
+msgid "Unselect All"
 msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
+msgid "Total size: %d / %d MB"
 msgstr ""
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Version: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Dimension: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr ""
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Entitât: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr ""
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "cause cal mancje %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "cause che %s no l'è sodisfat"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "ricercje dal miôr pachet %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "par tignî %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr ""
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr ""
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr ""
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr ""
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr ""
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instale"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "Selezion dal percors"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr ""
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr ""
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Gjestôr Software"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr ""
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr ""
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr ""
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr ""
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "pachet no cognossût"
 msgstr[1] "pachet no cognossût"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr ""
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configure"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr ""
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Selezion dal percors"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Al è intravignût un fal"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr ""
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr ""
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instale"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr ""
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Instale"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1010,32 +1182,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr ""
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1044,158 +1201,182 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr ""
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, fuzzy, c-format
 msgid "Load"
 msgstr "Locâl"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Salve"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Salve il file"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: steps_interactive.pm:583
-#, c-format
-msgid "Install suggested packages"
-msgstr ""
+#: steps_interactive.pm:579
+#, fuzzy, c-format
+msgid "Install recommended packages"
+msgstr "Instale atualizazions"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr ""
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr ""
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Torne a meti in vore"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr ""
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr ""
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr ""
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Atualizazions"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1208,121 +1389,114 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr ""
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr ""
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr ""
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr ""
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Rêt & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr ""
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr ""
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Nivel di Sigurece"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "disabilitât"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
+msgid "Preparing initial startup program..."
 msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1330,12 +1504,12 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Congratulazions"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Torne a inviâ"
@@ -1430,13 +1604,6 @@ msgid ""
 "Users"
 msgstr "Utents"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Rêt"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1480,6 +1647,21 @@ msgid ""
 msgstr "Jessì"
 
 #, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Desktop"
+
+#~ msgid "Welcome"
+#~ msgstr "Benvignût"
+
+#~ msgid "Select All"
+#~ msgstr "Ducj Selezionâts"
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Rêt"
+
+#, fuzzy
 #~ msgid "IceWm Desktop"
 #~ msgstr "Desktop"
 
diff --git a/perl-install/install/share/po/ga.po b/perl-install/install/share/po/ga.po
index ac08762c3..2266c96e1 100644
--- a/perl-install/install/share/po/ga.po
+++ b/perl-install/install/share/po/ga.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2005-09-12 18:04+0200\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -14,38 +14,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Stáisiún Oibre"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Thank you!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Be Free!"
 msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
 msgstr "An bhfuil ceann eile agat?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -54,112 +79,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Líonra (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Líonra (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Líonra (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Cumraigh NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Comhadlann"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Earráid ag oscailt %s do scríobh: %s"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, fuzzy, c-format
 msgid "Looking at packages already installed..."
 msgstr "Roghnaigh pacáistí ..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Ag cúrdach pacáistí le húasgrádú..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -168,87 +258,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Earráid ag léamh comhad %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Roghnaigh pacáistí ..."
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Líonra"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Roghnaight do theangam le do thoil."
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Tá an comhad ann cheana. Forscríobh?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Cead diúltaithe"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "Tá comhad %s lódailte."
 
-#: any.pm:1234
+#: any.pm:1519
 #, fuzzy, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Ní féidir liom rann eile a cur isteach"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Suiteáil"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "cumraíocht"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Is gá %s a fhormáidiú freisin"
@@ -270,22 +360,22 @@ msgstr "Ag tosnú suas an ghréasán"
 msgid "Bringing down the network"
 msgstr "Ag dúnadh síos an ghreasán"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Pointe taca dublach %s"
@@ -315,340 +405,422 @@ msgstr "deas"
 msgid "maybe"
 msgstr "b'fhéidir"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Gan cur síos"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Tharla earráid"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Theip ag feistiú"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Ag feistiál  pacáiste %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Stáisiún Oibre"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Stáisiún Oibre"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"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:26
 #, c-format
 msgid "Game station"
 msgstr "Stáisiún Cluichí"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Stáisiún ilmheánach"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Stáisiún Idirlíon"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, 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:42
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Printéir Gréasán (lpd)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Uirlisí Consóil"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Forbairt"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Doiciméadú"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Freastalaí Lín"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Grúpearraí"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Freastalaí Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, fuzzy, c-format
 msgid "Internet gateway"
 msgstr "suimiúil"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Ríomhphost/Nuacht"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Freastalaí Printéir"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Freastalaí Eolaire"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Freastalaí FTP:"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS "
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Ainm Fearannas"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Freastalaí Printéir"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Freastalaí NIS"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Bunachar Sonraí"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
+msgid "PostgreSQL and MariaDB Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Greasan/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Post"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "Freastalaí Printéir"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
+msgid "PostgreSQL or MariaDB database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Cláréadan Gréasán"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Timpeallacht Ghrafach"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Stáisiún KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Stáisiún Gnome"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, 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:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "Stáisiún KDE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Stáisiún Gnome"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Stáisiún Oibre"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Timpeallacht Ghrafach"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "Deasc"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Deasc"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Timpeallacht Ghrafach"
+
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Deasc"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Deasc Graphaicí Eile"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, c-format
 msgid "Utilities"
 msgstr "Uirlisí"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Freastalaí SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Seirbishí"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Cumraigh Idirlíon"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Cumraíocht Gréasánú"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "Bainteach le hIdirlíon"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Cumraigh printéir"
@@ -662,7 +834,7 @@ msgstr ""
 "Ta earraid ann, níl a fhios agam conas é a cheartú.\n"
 "Lean ort, ar do phriacal féin."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -678,328 +850,328 @@ msgstr "Ag tosnú ar céim `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Suiteáil Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Suiteáil %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr ""
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Roghnú Grúpa Pacáistí"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Eirigh as Feistiú"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "Deasc"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "Deasc"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "Deasc"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Roghnú Grúpa Pacáistí"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr ""
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Méid iomlán: %d / %d MB"
+msgid "Unselect All"
+msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Pacáiste mícheart"
+msgid "Total size: %d / %d MB"
+msgstr "Méid iomlán: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Leagan: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Méid: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Tábhacht: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr ""
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "kdesu ar iarraidh"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr ""
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr ""
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr ""
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr ""
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr ""
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Feistiú"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "Roghnú Grúpa Pacáistí"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, fuzzy, c-format
 msgid "Updating package selection"
 msgstr "Roghnú Grúpa Pacáistí"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, fuzzy, c-format
 msgid "Minimal install"
 msgstr "Eirigh as Feistiú"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Bainistíocht Bhogearraí"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Ag Feistiú"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, fuzzy, c-format
 msgid "No details"
 msgstr "Sonraí"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Am fagtha "
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Ag meastú"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pacáistí"
 msgstr[1] "%d pacáistí"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Coimriú"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Cumraigh"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "Cumraigh"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Roghnú Grúpa Pacáistí"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Tharla earráid"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Roghnaigh leagan amach do mhéarchláir"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, fuzzy, c-format
 msgid "Install/Upgrade"
 msgstr "Feistiúi/Uadgrádaigh"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, fuzzy, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Feistigh nó uasgrádaigh ?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Feistiú"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, fuzzy, c-format
 msgid "Upgrade %s"
 msgstr "Uasgrádaigh"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, fuzzy, c-format
 msgid "Encryption key for %s"
 msgstr "Ní mar a chéile na pasfhocail"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Suiteáil"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1008,32 +1180,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Ag cumraigh IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1042,158 +1199,182 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Ag curdach do na pacáistí atá ar fáil..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Lód"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Sábháil"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Lódáil comhad"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Roghnú Grúpa Pacáistí"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, fuzzy, c-format
 msgid "Type of install"
 msgstr "Roghnaigh pacáistí a feistiú ..."
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Le X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Ag feistiál  pacáiste %s"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Ag Ullmhaigh ríomhchlar thosnaithe..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Ag Ullmhaigh feistiú"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Ag feistiál  pacáiste %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Lean ar aghaidh ar aon nós?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Atriail"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Roghnú Grúpa Pacáistí"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Ag feistiál  pacáiste %s"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Cumraíocht Iar-feistú"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Leasuithe"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1206,121 +1387,114 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s ar %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Crua-earraí"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Carta Fuaim"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, fuzzy, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "An bhfuil ceann eile agat?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Comhéadan grafach"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Gréasán agus Idirlíon"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Ionadaithe"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "cumraithe"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Leibhéal Slándála"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Bac slándála"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "díchumasaithe"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Ag Ullmhaigh ríomhchlar thosnaithe..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Ag Ullmhaigh feistiú"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Cur isteach diosca folamh sa dioscthiomant %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1328,12 +1502,12 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Comhghairdeas"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Atosaigh"
@@ -1428,13 +1602,6 @@ msgid ""
 "Users"
 msgstr "Úsáideoirí"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Líonrú"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1477,6 +1644,32 @@ msgid ""
 "Exit"
 msgstr "Scoir"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Ag Ullmhaigh ríomhchlar thosnaithe..."
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Deasc"
+
+#~ msgid "Welcome"
+#~ msgstr "Fáilte"
+
+#, fuzzy
+#~ msgid "Select All"
+#~ msgstr "Roghnaigh Comhad"
+
+#~ msgid "Bad package"
+#~ msgstr "Pacáiste mícheart"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Ag Ullmhaigh ríomhchlar thosnaithe..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Líonrú"
+
 #, fuzzy
 #~ msgid "Downloading file %s..."
 #~ msgstr "Sabháil i gcomhad"
diff --git a/perl-install/install/share/po/gl.po b/perl-install/install/share/po/gl.po
index 5322d9934..77100c890 100644
--- a/perl-install/install/share/po/gl.po
+++ b/perl-install/install/share/po/gl.po
@@ -1,58 +1,83 @@
-# translation of DrakX to Galician
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-#
-# Proxecto Trasno http://trasno.net
-#
-# Jesús Bravo �lvarez (mdk) <jba@pobox.com>, 2001.
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2004, 2005, 2006, 2008.
-# Alejo Pacín Jul <alejopj@gmail.com>, 2009.
+# Translators:
+# Alejo Pacín Jul <alejopj@gmail.com>, 2009
+# Jesús Bravo �lvarez (mdk) <jba@pobox.com>, 2001
+# Leandro Regueiro <leandro.regueiro@gmail.com>, 2004-2006,2008
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-gl\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-09-24 18:30+0200\n"
-"Last-Translator: Alejo Pacín Jul <alejopj@gmail.com>\n"
-"Language-Team: Galician <cooker-i18n@mandrivalinux.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-26 19:12+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/mageia/language/"
+"gl/)\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 0.3\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "O seu escritorio nunha chave USB"
+msgid "Your choice!"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "A distribución de Mageia Linux 100%% código aberto"
+msgid "Office tools"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Explore Linux de forma sinxela con Mageia One"
+msgid "Home entertainment"
+msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Un escritorio Mageia Linux completo, con soporte"
+msgid "For kids"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: distribucións para as necesidades de cada un"
+msgid "For family!"
+msgstr ""
 
-#: any.pm:109
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Ten soportes suplementarios adicionais?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -65,93 +90,91 @@ msgstr ""
 "\n"
 "Ten algún soporte de instalación suplementario para configurar?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Rede (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Rede (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Rede (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Cal é o URL do sitio espello?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "O URL debe comezar por ftp:// ou por http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Contactando co sitio web de Mageia Linux para obte-la lista de sitios "
-"espello dispoñibles..."
+"Contactando co sitio web de %s para obte-la lista de sitios espello "
+"dispoñibles..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Erro ó contactar co sitio web de Mageia Linux para obte-la lista de sitios "
-"espello dispoñibles"
+"Erro ó contactar co sitio web de %s para obte-la lista de sitios espello "
+"dispoñibles"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Escolla un sitio espello dende o que obte-los paquetes"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Configuración de NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Introduza o nome de máquina e o directorio do soporte NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Falta o nome de máquina"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "O directorio debe comezar por \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Cal é o nome de máquina da montaxe NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Directorio"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Suplementario"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -160,23 +183,90 @@ msgstr ""
 "Non se puido atopar un ficheiro de lista de paquetes neste sitio espello.\n"
 "Asegúrese de que a localización é a correcta."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Buscando os paquetes que xa están instalados..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Buscando paquetes para actualizar..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Eliminando paquetes antes de actualizar..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -190,87 +280,87 @@ msgstr ""
 "\n"
 "Desexa eliminar estes paquetes?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erro ó le-lo ficheiro %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Renomeáronse os seguintes discos:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (chamado anteriormente %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rede"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Escolla un soporte"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "O ficheiro xa existe. ¿Desexa sobreescribilo?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nome NFS incorrecto"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "O soporte %s é incorrecto"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Non se pode captura-la pantalla antes de face-las particións"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Poderanse facer capturas de pantalla despois de instalar en %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalación"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configuración"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Tamén debe formatar %s"
@@ -294,22 +384,22 @@ msgstr "Activando a rede"
 msgid "Bringing down the network"
 msgstr "Desactivando a rede"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Por favor, agarde, recuperando o ficheiro"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "Incapaz de engadir o soporte"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Copiando algúns paquetes dos discos para un uso posterior"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Copiando"
@@ -339,7 +429,24 @@ msgstr "bo"
 msgid "maybe"
 msgstr "indiferente"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Non hai información xml do soporte \"%s\", só resultado parcial para o "
+"paquete %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Sen descrición"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -348,66 +455,76 @@ msgstr ""
 "Non se pode instalar algúns paquetes solicitados por %s:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Ocorreu un erro:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Ocorreu un erro moi grave: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "Erraron %d transaccións de instalación"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Errou a instalación de paquetes:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Estación de traballo"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Estación de Traballo de Oficina"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programas de oficina: procesadores de texto (OpenOffice.org Writer, Kword), "
-"follas de cálculo (OpenOffice.org Calc, Kspread), visualizadores de pdf, etc"
+"Programas de oficina: procesadores de texto (LibreOffice Writer, Kword), "
+"follas de cálculo (LibreOffice Calc, Kspread), visualizadores de pdf, etc"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Estación de xogos"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programas de diversión: arcade, taboleiros, estratexia, etc"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Estación multimedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programas de reproducción e edición de son e vídeo"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Estación de Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -416,194 +533,194 @@ msgstr ""
 "Conxunto de ferramentas para ler e enviar correo-e e novas (mutt, tin...) e "
 "para navegar pola Web"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Ordenador de Rede (cliente)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clientes para diferentes protocolos incluíndo ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ferramentas para facilita-la configuración do ordenador"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Ferramentas de Consola"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editores, shells, ferramentas de ficheiro, terminais"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Desenvolvemento"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 "Bibliotecas de desenvolvemento de C e C++, programas e ficheiros include"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentación"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Libros e Howtos sobre Linux e o Software Libre"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Soporte para aplicacións de terceiros"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Servidor Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Servidor Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Cortalumes/Encamiñador"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Pasarela de Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Correo/Novas"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Servidor de correo Postfix, servidor de novas Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Servidor de Directorio"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Servidor de Nomes de Dominio e Información de Rede"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Servidor de Compartimento de Impresoras e Ficheiros"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Servidor NFS, servidor Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Bases de datos"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Servidores de bases de datos PostgreSQL e MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Servidores de bases de datos PostgreSQL e MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Correo-e"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Servidor de correo Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidores de bases de datos PostgreSQL ou MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Servidores de bases de datos PostgreSQL ou MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Servidor de Redes de Ordenadores"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor ssh"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambiente Gráfico"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Estación de Traballo KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -612,12 +729,12 @@ msgstr ""
 "O Ambiente de Escritorio KDE, o ambiente gráfico básico cunha colección de "
 "ferramentas que o acompañan"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Estación de Traballo GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -626,67 +743,122 @@ msgstr ""
 "Un ambiente gráfico cun conxunto de aplicacións amigables e ferramentas de "
 "escritorio"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Escritorio LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Un entorno gráfico lixeiro e rápido cun conxunto de aplicacións e "
-"ferramentas de escritorio de fácil manexo"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Outros Escritorios Gráficos"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilidades"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Servidor SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Servidor de Configuración Remota Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Monitorización/Utilidades de Rede"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 "Ferramentas de monitorización, accounting de procesos, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Asistentes de Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Asistentes para configurar o servidor"
@@ -700,7 +872,7 @@ msgstr ""
 "Ocorreu un erro, e o programa non sabe como manexalo de\n"
 "maneira limpa. Continúe baixo a súa propia responsabilidade."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -720,253 +892,253 @@ msgstr "Chegando ó paso '%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Instalación de Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Instalación de %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> entre elementos"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Ó servidor Xorg lévalle tempo arrincar. Agarde..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "O seu sistema ten poucos recursos. Pode que teña algún problema\n"
-"ó instalar Mageia Linux. Se iso acontece, pode intenta-la instalación\n"
+"ó instalar %s. Se iso acontece, pode intenta-la instalación\n"
 "en modo texto. Para iso, prema 'F1' cando arrinque dende o CDROM,\n"
 "e escriba 'text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Instalar o Escritorio KDE de Mageia"
+msgid "Media Selection"
+msgstr "Selección de Soportes"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Instalar o Escritorio GNOME de Mageia"
+msgid "Install %s KDE Desktop"
+msgstr "Instalar o Escritorio KDE de %s"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Instalar o Escritorio GNOME de %s"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Instalación personalizada"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Escritorio KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Escritorio GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Escritorio Personalizado"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Aquí ten unha vista previa do escritorio '%s'."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Prema nas imaxes para ter unha vista previa maior"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Selección de Grupos de Paquetes"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Selección individual de paquetes"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Tamaño total: %d / %d MB"
+msgid "Unselect All"
+msgstr "Deseleccionar Todo"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Paquete erróneo"
+msgid "Total size: %d / %d MB"
+msgstr "Tamaño total: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versión: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Tamaño: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Importancia: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Non pode seleccionar/deseleccionar este paquete"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "debido a que falta %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "debido a %s non satisfeitas"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "tratando de promover %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "para manter %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Non pode seleccionar este paquete xa que non hai espacio dabondo para "
 "instalalo"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Vanse instala-los seguintes paquetes"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Vanse elimina-los seguintes paquetes"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Este é un paquete obrigatorio, non se pode deseleccionar"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Non pode deseleccionar este paquete. Xa está instalado"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Non pode deseleccionar este paquete. Ten que ser actualizado"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Amosa-los paquetes seleccionados automáticamente"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalar"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Cargar/Gardar a selección"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Actualizando a selección de paquetes"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Instalación mínima"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Xestión do Software"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Escolla os paquetes que desexa instalar"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalando"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Sen detalles"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Tempo restante:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(estimando...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d paquete"
 msgstr[1] "%d paquetes"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Resumo"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configurar"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "non configurado"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Selección de Soportes"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -975,12 +1147,12 @@ msgstr ""
 "Atopáronse os seguintes soportes de instalación.\n"
 "Se desexa saltar algún deles, pode deseleccionalo agora."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Ten a opción de copiar os contidos dos CDs ó disco duro antes da "
@@ -988,72 +1160,72 @@ msgstr ""
 "Esta continuará despois dende o disco duro e os paquetes permanecerán "
 "dispoñibles unha vez que o sistema xa estea instalado."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copiar CDs enteiros"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Ocorreu un erro"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Escolla a disposición do seu teclado"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Esta é a lista completa dos teclados dispoñibles:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalar/Actualizar"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "¿É unha instalación ou unha actualización?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalación"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Actualizar %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clave de cifrado para %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Cancelar a instalación, rearrincar o sistema"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Nova Instalación"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Actualizar unha instalación previa (non recomendado)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1061,46 +1233,18 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"O instalador detectou que o sistema Mageia Linux que ten instalado non\n"
-"pode ser actualizado de maneira segura a %s\n"
-"\n"
-"Recoméndase unha nova instalación que reemprace a anterior.\n"
-"\n"
-"Ollo: debería de facer unha copia de seguridade de tódolos seus datos antes\n"
-"de escoller \"Nova Instalación\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Configurando IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Non hai espacio libre para 1MB de bootstrap! A instalación ha continuar, "
-"pero para arrincar o seu sistema, cómpre crear a partición bootstrap en "
-"DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Precisa crear unha partición de arrinque (PPC PReP Boot boostrap)! A "
-"instalación continuará, pero para arrincar o seu sistema, precisará crear a "
-"partición de arrinque con DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1112,12 +1256,12 @@ msgstr ""
 "Insira o CD-ROM que teña a etiqueta \"%s\" na unidade e prema Aceptar.\n"
 "Se non o ten, prema Cancelar para omiti-la instalación deste CD-ROM."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Buscando os paquetes dispoñibles..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1126,7 +1270,7 @@ msgstr ""
 "O seu sistema non ten espacio libre dabondo para a instalación ou "
 "actualización (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1135,52 +1279,52 @@ msgstr ""
 "Elixa cargar ou gardar a selección de paquetes.\n"
 "O formato é o mesmo có dos ficheiros xerados por auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Cargar"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Gardar"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Ficheiro erróneo"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Selección de Escritorio"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Pode escoller o seu perfil de escritorio de estación de traballo."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "O tamaño seleccionado é maior có tamaño dispoñible"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipo de instalación"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1189,88 +1333,112 @@ msgstr ""
 "Non seleccionou ningún grupo de paquetes.\n"
 "Seleccione a instalación mínima que desexa:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Con X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Instalando os paquetes propostos"
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Coa documentación básica (¡recomendado!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instalación realmente mínima (especialmente sen urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Preparando a instalación"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalando o paquete %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Houbo un erro ó ordena-los paquetes:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "¿Continuar de tódolos xeitos?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Volver tentar"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Omitir este paquete"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Omitir tódolos paquetes do soporte \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Volver a soportes e selección de paquetes"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Houbo un erro ó instala-ls paquetes %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuración trala instalación"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Asegúrese de que o soporte de Módulos de Actualización está na unidade %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Actualizacións"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1291,28 +1459,29 @@ msgstr ""
 "\n"
 "Desexa instala-las actualizacións?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s en %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Tarxeta de son"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Ten unha tarxeta de son ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1321,82 +1490,70 @@ msgstr ""
 "Execute \"alsaconf\" ou \"sndconfig\" despois da instalación para configura-"
 "la tarxeta de son"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Non se detectou ningunha tarxeta de son. Execute \"harddrake\" trala "
 "instalación"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interface Gráfica"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Rede & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxys"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "configurado"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Nivel de Seguridade"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Cortalumes"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "activado"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "desactivado"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Non configurou as X. Está seguro de que desexa isto?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Preparando o cargador de arrinque..."
+msgid "Preparing initial startup program..."
+msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Sexa paciente, isto pode levar un anaco..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Semella ser que ten unha máquina Descoñecida ou de Tempos Prehistóricos, e o "
-"cargador de arrinque yaboot non ha funcionar nela. A instalación vai "
-"continuar, pero ha ter que usar BootX ou algún outro recurso para arrincar a "
-"máquina. O argumento do kernel para o sistema de ficheiros raíz é: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1405,17 +1562,17 @@ msgstr ""
 "Con este nivel de seguridade, o acceso ós ficheiros da partición Windows "
 "está restrinxido ó administrador."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Insira un disquete baleiro na unidade %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Creando un disquete de instalación automática..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1426,12 +1583,12 @@ msgstr ""
 "\n"
 "Desexa saír agora?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Noraboa"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Reiniciar"
@@ -1526,13 +1683,6 @@ msgid ""
 "Users"
 msgstr "Usuarios"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Rede"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1574,164 +1724,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Sair"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programas de oficina: procesadores de texto (kword, abiword), follas de "
-#~ "cálculo (kspread, gnumeric), visualizadores de pdf, etc"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Descargando o ficheiro %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr ""
-#~ "Non está soportada a actualización dende unha distribución de 32 bits a "
-#~ "unha de 64 bits"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr ""
-#~ "Non está soportada a actualización dende unha distribución de 64 bits a "
-#~ "unha de 32 bits"
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Seleccionou os seguintes servidores: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Estes servidores están activados por defecto. Non teñen ningún problema "
-#~ "de\n"
-#~ "seguridade coñecido, pero pode ser que se lles atopen algúns. Nese caso,\n"
-#~ "debe asegurarse de actualizar tan rápido como sexa posible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Desexa instalar estes servidores?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "Escritorio IceWm"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr ""
-#~ "Contactando co sitio espello para obte-la lista dos paquetes "
-#~ "dispoñibles..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Non se puido contactar co sitio espello %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Xerar un disquete de instalación automática"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "A instalación automática pode estar moi automatizada\n"
-#~ "se así se desexa, nese caso tomará o control do disco\n"
-#~ "duro (isto está pensado para a instalación noutro equipo).\n"
-#~ "\n"
-#~ "Pode preferir reproducir outra vez a instalación.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Reproducir"
-
-#~ msgid "Automated"
-#~ msgstr "Automatizada"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Garda-la selección de paquetes"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Desexa usar aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Erro ó instalar aboot, \n"
-#~ "desexa probar a forza-la instalación mesmo se iso destrúe a primeira "
-#~ "partición?"
-
-#~ msgid "All"
-#~ msgstr "Todos"
-
-#~ msgid "TV card"
-#~ msgstr "Tarxeta de TV"
-
-#~ msgid "Boot"
-#~ msgstr "Arrinque"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Autenticación"
-
-#~ msgid "Gwenview"
-#~ msgstr "Gwenview"
-
-#~ msgid "Invictus Firewall"
-#~ msgstr "Cortalumes Invictus"
-
-#, fuzzy
-#~ msgid "New Theme"
-#~ msgstr "Novo tema para Webmin"
-
-#~ msgid "DrakVPN"
-#~ msgstr "DrakVPN"
-
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "(%d paquete, %d MB)"
-#~ msgstr[1] "(%d paquetes, %d MB)"
-
-#~ msgid "%d packages"
-#~ msgstr "%d paquetes"
-
-#~ msgid "Language"
-#~ msgstr "Lingua"
-
-#~ msgid "License"
-#~ msgstr "Licenza"
-
-#~ msgid "Installation class"
-#~ msgstr "Clase de instalación"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "Estimando"
-
-#~ msgid "Choosing packages"
-#~ msgstr "Escollendo os paquetes"
-
-#~ msgid "Users"
-#~ msgstr "Usuarios"
-
-#~ msgid "Networking"
-#~ msgstr "Rede"
-
-#~ msgid "Configure X"
-#~ msgstr "Configura-las X"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "Non se puido acceder ós módulos do kernel correspondentes ó seu kernel "
-#~ "(falta o ficheiro %s), isto xeralmente significa que o seu disquete de "
-#~ "arrinque non está sincronizado co soporte de Instalación (cree un novo "
-#~ "disquete de arrinque)"
diff --git a/perl-install/install/share/po/he.po b/perl-install/install/share/po/he.po
index 5b5d7de64..f825949a0 100644
--- a/perl-install/install/share/po/he.po
+++ b/perl-install/install/share/po/he.po
@@ -1,62 +1,87 @@
-# translation of DrakX.po to Hebrew
-# Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# This file is distributed under the GNU GPL license.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-#
-# Ram Matityahu  <linuxfun@email.com>, 2003.
-# nadav mavor <nadav@mavor.com>, 2003.
-# el-cuco <cuco3001@yahoo.com>, 2003.
-# Diego Iastrubni <iastrubn@actcom.co.il>, 2003.
-# dovix <dovix2003@yahoo.com>, 2004, 2005.
-# Itay Flikier <itayff@gmail.com>, 2005.
-# Dotan Kamber <kamberd@yahoo.com>, 2007, 2008.
+# Translators:
+# Diego Iastrubni <iastrubn@actcom.co.il>, 2003
+# Dotan Kamber <kamberd@yahoo.com>, 2007-2008
+# dovix <dovix2003@yahoo.com>, 2004-2005
+# el-cuco <cuco3001@yahoo.com>, 2003
+# Itay Flikier <itayff@gmail.com>, 2005
+# nadav mavor <nadav@mavor.com>, 2003
+# Ram Matityahu  <linuxfun@email.com>, 2003
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2008-09-30 18:23+0200\n"
-"Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
-"Language-Team: Hebrew\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 04:07+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/mageia/language/"
+"he/)\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, c-format
+msgid "Office tools"
+msgstr ""
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "שולחן העבודה שלך במפתח USB"
+msgid "For kids"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "הפצת מנדריבה לינוקס שהי� 100%% קוד פתוח"
+msgid "For family!"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "בדוק �ת לינוקס בקלות ע� מנדריבה One"
+msgid "For developers!"
+msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "שולחן עבודה מל� של מנדריבה לינוקס, ע� תמיכה"
+msgid "Thank you!"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "מנדריבה: הפצות לצרכי� של כל �חד"
+msgid "Be Free!"
+msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "ה�� יש לך מקורות התקנה נוספי�?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -69,89 +94,87 @@ msgstr ""
 "\n"
 "ה�� יש לך מקורות נוספי� להתקנה שברצונך להגדיר?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "תקליטור"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "רשת (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "רשת (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "רשת (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "כתובת URL של �תר המר�ה?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "על הכתובת להתחיל ב-//:ftp �ו ב-//:http"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "מתחבר ל�תר מנדריבה לינוקס בכדי לקבל רשימה של �תרי מר�ה זמיני�..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr ""
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr "כשל בחיבור ל�תר מנדריבה לינוקס בכדי לקבל רשימה של �תרי מר�ה זמיני�"
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr ""
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "עליך לבחור �ת �תר המר�ה ממנו יורדו החבילות"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "הגדרת NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "נ� להזין �ת ש� המ�רח ו�ת התיקיה בה נמצ� מקור ה-NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "ש� המ�רח חסר"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "על התיקיה להתחיל ב=\"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "ש� המ�רח של עיגון ה-NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "ספרייה"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "תוספי�"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -159,23 +182,90 @@ msgid ""
 msgstr ""
 "�ין �פשרות למצו� קובץ המכיל רשימת חבילות במקור זה. נ� לווד� שהכתובת תקינה."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "מחפש חבילות שכבר מותקנות..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "מ�תר חבילות שיש לשדרג..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -188,87 +278,87 @@ msgstr ""
 "\n"
 "ה�� ב�מת ברצונך להסיר חבילות �לה?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "שגי�ה בקרי�ת הקובץ %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "שמות הכוננ(י�) הב�י� שונו:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (הש� הקוד� הו� %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "רשת"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "עליך לבחור מקור"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "הקובץ כבר קיי�. לשכתב?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "הגישה נדחתה"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "ש� NFS ל�-תקין"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "המקור %s �ינו תקין"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "�ין �פשרות לשמור תמונות מסך לפני חלוקה למחיצות"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "ניתן למצו� �ת תמונות המסך �חרי התקנה ב%s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "התקנה"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "הגדרות"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "חובה עליך לפרמט ג� �ת %s"
@@ -292,22 +382,22 @@ msgstr "מ�תחל �ת שירותי הרשת"
 msgid "Bringing down the network"
 msgstr "מוריד �ת שירותי הרשת"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr ""
+msgstr "ל� ניתן להוסיף �ת המקור"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "מעתיק מספר חבילות על הכונני� לשימוש עתידי"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "מעתיק �ת התקליטור לכונן הקשיח"
@@ -337,7 +427,22 @@ msgstr "מומלץ"
 msgid "maybe"
 msgstr "ל� הכרחי"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr "�ין מידע ב-xml למקור \"%s\", תוצ�ה חלקית בלבד עבור החבילה %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "לל� תי�ור"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -346,66 +451,76 @@ msgstr ""
 "ל� ניתן להתקין חלק מהחבילות המבוקשות על ידי %s:\n"
 "%s"
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "חלה שגי�ה"
+msgstr ""
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "שגי�ה חמורה �ירעה : %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "�ל תש�ל שוב"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d התקנות נכשלו"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "מתקין חבילה %s"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "תחנת עבודה"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "תחנת עבודה משרדית"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
 "תוכנות משרד: מעבדי תמלילי� (כתבן �ופן �ופיס, Kword), גיליונות �לקטרוני� "
 "(גיליון �ופן �ופיס, Kspread),מציגי pdf, ועוד"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "תחנת עבודה למשחקי�"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "תוכנות לבידור: �רקייד, לוח, �סטרטגיה, ועוד"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "תחנת עבודה למולטימדיה"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "תוכנות להשמעה �ו עריכה של קול וויד�ו"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "תחנת עבודה ל�ינטרנט"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -413,269 +528,326 @@ msgid ""
 msgstr ""
 "ערכת כלי� לקרי�ה וכתיבת דו�\"ל וחדשות  (pine, mutt, tin..) ולגלישה ב�ינטרנט"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "מחשב רשת (לקוח)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "לקוחות לפרוטוקולי� שוני� כולל ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "כלי עזר לביצוע הגדרות המחשב שלך"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "כלי מסוף"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "פיתוח"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "מסמכי�"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "תמיכה בתוכנות צד שלישי. Linux Standard Base"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "שרת �יחסון �תרי�"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "עבודה בקבוצה"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "שרת Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "חומת �ש/נתב"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "הגנת המערכת בעת חיבור ל�ינטרנט"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "דו�ר/קבוצות דיון"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "שרת דו�ר Postfix, שרת קבוצות דיון Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "שרת ספרייה"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "שרת FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "שרת שמות מתח� ומידע רשת"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "שרת שיתוף קבצי� ומדפסות"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "מסדי נתוני�"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "שרת מסד נתוני� MySQL �ו PostgreSQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "שרת מסד נתוני� MariaDB �ו PostgreSQL"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "דו�ר"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "שרת דו�ר Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "שרת מסד נתוני� MySQL �ו PostgreSQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "שרת מסד נתוני� MariaDB �ו PostgreSQL"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "שרת מחשב רשת"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "סביבה גרפית"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "סביבת העבודה KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "סביבת העבודה GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש ע� מגוון יישומי� נלווי�"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "שולחן עבודה IceWm"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש ע� מגוון יישומי� נלווי�"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "סביבות עבודה �חרות"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "סביבות עבודה קלילות כגון Window Maker, Enlightenment, Fvwm, ועוד"
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "תוכנות שרות"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "שרת SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "שרת הגדרה תצורה מרחוק Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "כלי הגדרת וניטור רשת"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "כלי ניטור, בקרת תהליכי�, tcpdump , nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "�שפי מנדריבה"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "�שפי� להגדרת השרת שלך"
@@ -689,7 +861,7 @@ msgstr ""
 "חלה תקלה, �ך �יני יודע �יך לפתור �ותה.\n"
 "המשך הפעולה הינו ב�חריותך בלבד."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -708,250 +880,247 @@ msgstr "נכנס לשלב `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "התקנת מנדריבה לינוקס %s"
+msgid "%s Installation %s"
+msgstr ""
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> בין רכיבי�"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "שרת ה-Xorg מתחיל ב�טיות, נ� להמתין..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"המערכת שלך בעלת מש�בי� נמוכי�. במהלךהתקנת מנדריבה לינוקס עלולות להופיע\n"
-"בעיות. במקרה שכזה, ניתן להתקין בעזרת ממשק טקסטו�לי. להתקנה טקסטו�לית יש \n"
-"ללחוץ על מקש F1 כ�שר מ�תחלי� מהתקליטור ולהכניס 'text' בשורת הפקודה."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr ""
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "התקנת שולחן העבודה KDE של מנדריבה"
+msgid "Install %s KDE Desktop"
+msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "התקנת שולחן העבודה GNOME של מנדריבה"
+msgid "Install %s GNOME Desktop"
+msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "התקנה מות�מת �ישית"
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "שולחן עבודה IceWm"
+msgstr ""
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "שולחן עבודה IceWm"
+msgstr ""
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "שולחן עבודה IceWm"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "בחירת קבוצת חבילות לפי נוש�"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "בחירת חבילות ב�ופן פרטני"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "גודל כללי: %d / %d MB"
+msgid "Unselect All"
+msgstr "בטל בחירת הכל"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "חבילה פגומה"
+msgid "Total size: %d / %d MB"
+msgstr "גודל כללי: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "גרסה: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "גודל: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "חשיבות: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "�י �פשר לבחור/לבטל �ת החבילה הזו"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "בגלל שחסר %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "עקב תלות של� מול�ה %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "מנסה לקד� %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "בכדי לשמור %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "�י �פשר לבחור בחבילה זו מכיוון של� נותר מספיק מקו� פנוי להתקינה"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "החבילות הב�ות עומדות להיות מותקנות"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "החבילות הב�ות עומדות להיות מוסרות"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "זוהי חבילה בסיסית, �י �פשר לבטל �ת בחירתה"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "�ין �פשרות לבטל חבילה זו מכיוון שהי� כבר מותקנת"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "ל� ניתן לבטל �ת בחירת חבילה זו, חובה לשדרג �ותה"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "הר�ה חבילות שנבחרו ב�ופן �וטומטי"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "התקנה"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "טעינת/שמירת �זור נבחר"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "עדכון בחירת חבילות"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "התקנה מינימלית"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "תוכנות"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "עליך לבחור �ת החבילות שברצונך להתקין:"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "מתקין"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "לל� פרטי�"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "זמן נותר:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(מעריך...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d חבילה"
 msgstr[1] "%d חבילות"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "סיכו� ובדיקת הגדרות"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "הגדרות"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "ל� מוגדר"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "בחירת קבוצת חבילות לפי נוש�"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -960,84 +1129,84 @@ msgstr ""
 "מקורות התוכנה הב�י� זמיני� להתקנה.\n"
 "ב�פשרותך לדלג על חלק מהמקורות על ידי ביטול הסימוני� המת�ימי�."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "ניתן להעתיק �ת תכולת התקליטורי� לכונן הקשיח לפני תחילת ההתקנה.\n"
 "�� �פשרות זו מופעלת, ההתקנה תמשיך מהכונן הקשיח, וכל החבילות מתקליטורי ההתקנה "
 "יהיו זמינות �חרי סיו� ההתקנה מהכונן הקשיח."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "העתקת תקליטורי� שלמי�"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "חלה שגי�ה"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "בשלב זה עליך להגדיר �ת פרישת המקלדת שלך"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "להלן הרשימה המל�ה של המדפסות הזמינות"
+msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "התקנה/עדכון"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "ה�� זו התקנה �ו שידרוג?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "התקנה"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "שידרוג %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "מפתח הצפנה עבור %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "התקנה"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1046,36 +1215,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "מגדיר IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"ל� נמצ� מקו� פנוי עבור bootstrap בגודל 1MB! ההתקנה תמשיך, �בל בכדי ל�תחל �ת "
-"המערכת שלך, יהיה עליך ליצור מחיצת bootstrap ב�ופן ידני בעזרת DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"עליך ליצור PPC PReP Boot bootstrap! ההתקנה תמשיך, �בל בכדי  ל�תחל �ת המערכת "
-"יהיה עליך ליצור מחיצת bootstrap ב�ופן ידני בעזרת DiskDrak "
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1089,19 +1239,19 @@ msgstr ""
 "ול�חר מכן ללחוץ על כפתור \"�ישור\". �� תקליטור זה �ינו ברשותך,\n"
 "עליך ללחוץ על כפתור \"ביטול\" בכדי לדלג על התקנת חבילות �לו."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "מחפש חבילות זמינות..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr "למערכת שלך ל� נותר די מקו� להתקנה �ו שדרוג (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1110,53 +1260,52 @@ msgstr ""
 "עליך לבחור ב�� לטעון �ו לשמור �ת בחירת החבילות.\n"
 "מבנה הקובץ זהה לקובץ auto_install הנוצר ב�ופן �וטומטי."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "הספק"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "שמור"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "קובץ ל�-תקין"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "בחירת קבוצת חבילות לפי נוש�"
+msgstr ""
 
-#: steps_interactive.pm:474
-#, fuzzy, c-format
+#: steps_interactive.pm:460
+#, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
-"ב�פשרותך לבחור �ת מת�ר שולחן העבודה של התחנה שלך: KDE, GNOME �ו מות�� �ישית"
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "הגודל הנבחר גדול יותר מהמקו� הזמין"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "סוג ההתקנה"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1165,87 +1314,111 @@ msgstr ""
 "ל� נבחרה �ף קבוצה של חבילות.\n"
 "נ� לבחור �ת ההתקנה המינימלית שברצונך לבצע:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "ע� סביבה גרפית (X)"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "מתקין חבילה %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "ע� מסמכי� בסיסיי� (מומלץ!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "התקנה מינימלית �מיתית (בייחוד ל� urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "מכין �ת ההתקנה"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "מתקין חבילה %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "התרחשה שגי�ה בסידור חבילות:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "ה�� להמשיך בכל מקרה?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "ניסיון נוסף"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "דלג על חבילה זו"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "דלג על כל החבילות ממקור \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "חזרה לבחירת מקורות וחבילות"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "חלה שגי�ה בהתקנת החבילה %s"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "מבצע הגדרות ל�חר-התקנה"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "נ� לוד� שהמקור לעידכוני� בכונן %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "עדכוני�"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1264,28 +1437,29 @@ msgstr ""
 "להורדת חבילות �לה נדרש חיבור �ינטרנט עובד. ה�� ברצונך לעדכן �ת המערכת בשלב "
 "×–×” ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s על %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "חומרה"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "כרטיס קול"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ה�� יש לך כרטיס קול ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1294,96 +1468,85 @@ msgstr ""
 "עליך להריץ �ת \"alsaconf\" �ו \"sndconfig\" �חרי ההתקנה בכדי להגדיר �ת כרטיס "
 "הקול שלך"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "ל� זוהו כרטיסי קול. יש לנסות �ת ה�שף \"harddrake\"  ל�חר ההתקנה"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "ממשק גרפי"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "רשת ו�ינטרנט"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "שרתי� מתווכי�"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "מוגדר"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "סף ה�בטחה המבוקש:"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "חומת �ש"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "פועל"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "מנותק"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "ל� הוגדר ממשק גרפי (X). ה�� �כן ברצונך לבחור �פשרות זו?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "מכין �ת מנהל ה�תחול..."
-
-#: steps_interactive.pm:1027
-#, c-format
-msgid "Be patient, this may take a while..."
+msgid "Preparing initial startup program..."
 msgstr ""
 
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1041
 #, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
+msgid "Be patient, this may take a while..."
 msgstr ""
-"נר�ה כי יש לך מכונת OldWorld �ו מכונה ל� מזוהה, טוען המערכת yaboot ל� יעבוד "
-"במקרה זה. ההתקנה תמשך �בל יהיה עליך להשתמש ב-BootX �ו ב�מצעי �חר ל�תחול "
-"המערכת. משנה גלעין המערכת למערכת קבצי השורש הו�: root=%s"
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "ברמת �בטחה זו, גישה לקבצי� במחיצת החלונות תת�פשר רק למנהל המערכת."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "נ� להכניס תקליטון ריק לכונן %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "יוצר תקליטון הפעלה �וטומטית..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1394,12 +1557,12 @@ msgstr ""
 "\n"
 "ה�� ב�מת ברצונך לצ�ת עכשיו?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "ברכותינו!"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "הפעלה מחדש"
@@ -1494,13 +1657,6 @@ msgid ""
 "Users"
 msgstr "משתמשי�"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "עבודה ברשת"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1542,86 +1698,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "יצי�ה"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "תוכנות משרד: מעבדי טקסט (kword, abiword), גיליונות �לקטרוני� (kspread, "
-#~ "gnumeric),מציגי pdf, ועוד"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "מוריד קובץ %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr "שדרוג מהפצת 32ביט להפצת 64ביט �ינו נתמך"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr "שרוג מהפצת 64ביט להפצת 32 ביט �ינו נתמך"
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "בחירת החבילות כוללת �ת השרת(י�) הב�(י�): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "שרתי� �לו יופעלו כברירת מחדל. יתכן ש�ין כרגע בעיות �בטחה ידועות,\n"
-#~ " �ך בעיות חדשות עלולות להתגלות מדי פע�. �נו ממליצי� על שדרוג תקופתי\n"
-#~ "של תוכנות �לו כדי להגן על המערכת.\n"
-#~ "\n"
-#~ "\n"
-#~ "ה�� ברצונך להתקין שרתי� �לו בשלב זה?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "שולחן עבודה IceWm"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "מתחבר ל�תר המר�ה כדי לקבל �ת רשימת החבילות הזמינות..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "ל� יכול להתחבר ל�תר המר�ה  %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "בניית תקליטון הפעלה �וטומטית"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "יש ב�פשרותך לבצע התקנות חוזרות ב�ופן �וטומטי לחלוטין.\n"
-#~ "במקרה זה יימחק כל תוכן הכונן הקשיח!!\n"
-#~ "תכונה זו שימושית להתקנת המערכת על מספר רב של מחשבי�.\n"
-#~ "\n"
-#~ "ב�� �ינך רוצה במחיקת כל תוכן הכונן הקשיח יש לבחור במנגנון שחזור ההתקנה.\n"
-
-#~ msgid "Replay"
-#~ msgstr "שחזור התקנה"
-
-#~ msgid "Automated"
-#~ msgstr "�וטומטי"
-
-#~ msgid "Save packages selection"
-#~ msgstr "שמירת בחירת החבילות"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "ה�� ברצונך להשתמש בaboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "שגי�ה בהתקנת aboot,\n"
-#~ "ה�� לנסות ל�לץ �ת ההתקנה �פילו �� המחיצה הר�שונה עלולה להיהרס?"
diff --git a/perl-install/install/share/po/hi.po b/perl-install/install/share/po/hi.po
index cb0658608..c6611963f 100644
--- a/perl-install/install/share/po/hi.po
+++ b/perl-install/install/share/po/hi.po
@@ -1,54 +1,81 @@
-# translation of DrakX-hi.po to हिन�दी, भारत (Hindi, India)
-# Copyright (C) 2003,2004 Free Software Foundation, Inc.
-# धनञ�जय शर�मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>, 2003, 2004.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# धनञ�जय शर�मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>, 2003-2004
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-hi\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2004-04-04 21:54+0530\n"
-"Last-Translator: धनञ�जय शर�मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
-"Language-Team: हिन�दी (Hindi) <dysxhi@yahoo.co.in>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 04:07+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/mageia/language/"
+"hi/)\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
-#, fuzzy, c-format
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
+#, c-format
 msgid "Do you have further supplementary media?"
-msgstr "कया आपके पास �क और है ?"
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -57,116 +84,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "सीडी-रॉम"
 
-#: any.pm:121
-#, fuzzy, c-format
+#: any.pm:163
+#, c-format
 msgid "Network (HTTP)"
-msgstr "%s नेटवर�क"
+msgstr ""
 
-#: any.pm:122
-#, fuzzy, c-format
+#: any.pm:164
+#, c-format
 msgid "Network (FTP)"
-msgstr "%s नेटवर�क"
+msgstr ""
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"उपलब�ध मिररों की सूची को प�राप�त करने के लि� मैनड�रिव लिनक�स वेब-स�थल से सम�पर�क किया जा "
-"रहा है..."
 
-#: any.pm:187
-#, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+#: any.pm:253
+#, c-format
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"उपलब�ध मिररों की सूची को प�राप�त करने के लि� मैनड�रिव लिनक�स वेब-स�थल से सम�पर�क किया जा "
-"रहा है..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "�क मिरर का चयन करें जहा� से पैकेजों को प�राप�त करना है"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "डिरेक�ट�री"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
-#, fuzzy, c-format
+#: any.pm:369
+#, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
-msgstr "%s को %s पर नहीं पाया जा सका"
+msgstr ""
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "पहिले से संसाधित पैकेजों को देखा जा रहा है..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "उन�नयन के लिये पैकेजों को खोजा जा रहा है..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -179,87 +267,87 @@ msgstr ""
 "\n"
 "क�या वास�तव में इन पैकेजों को हटाना चाहते है?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s संचिका को प�ने में त�र�टि"
 
-#: any.pm:1020
-#, fuzzy, c-format
+#: any.pm:1304
+#, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "निम�नलिखित पैकेजों का संसाधन करना आवश�यक है:\n"
+msgstr ""
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "�चटीटीपी"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "�फटीपी"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "�न�फ़�स"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "नेटवर�क"
 
-#: any.pm:1102
-#, fuzzy, c-format
+#: any.pm:1386
+#, c-format
 msgid "Please choose a media"
-msgstr "कृपया चयन करें"
+msgstr ""
 
-#: any.pm:1118
-#, fuzzy, c-format
+#: any.pm:1402
+#, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "फाईल पहले से है प�न बना��"
+msgstr ""
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "अन�मति नहीं है"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
-#, fuzzy, c-format
+#: any.pm:1475
+#, c-format
 msgid "Bad media %s"
-msgstr "%s माध�यम को जोड़ा गया"
+msgstr ""
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "विभाजनीकरण के पूर�व स�क�रीन-चित�र-माला को नहीं लिया जा सकता है"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "%s में संसाधन के उपरान�त स�क�रीन चित�र-माला उपलब�ध होगी"
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
-msgstr "संसाधन हो रहा है"
+msgstr ""
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "संरचना"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "आपको %s को भी �कसार करना चाहि�"
@@ -284,25 +372,25 @@ msgstr "नेटवर�क को लाया जा रहा है"
 msgid "Bringing down the network"
 msgstr "नेटवर�क को लाया जा रहा है"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
-#, fuzzy, c-format
+#: media.pm:805
+#, c-format
 msgid "Copying in progress"
-msgstr "खोज जारी है"
+msgstr ""
 
 #: pkgs.pm:32
 #, c-format
@@ -329,73 +417,96 @@ msgstr "बह�त अच�छा"
 msgid "maybe"
 msgstr "हो सकता है"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "कोई वर�णन नहीं"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
 msgstr "�क त�र�टि हो गयी है"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "�क घातक त�र�टि घटित ह�ई है: %s "
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d संसाधन क�रिया-कलाप असफ़ल"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "%s पैकेज का संसाधन हो रहा है"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "कार�यकेंद�र"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "ऑफ़िस कार�यकेन�द�र"
 
-#: share/meta-task/compssUsers.pl:17
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:20
+#, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"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:26
 #, c-format
 msgid "Game station"
 msgstr "खेल स�टेशन"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "मनोरंजक कार�यक�रम: आरकेड, बोर�ड, व�यूह-रचना, इत�यादि "
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "मल�टीमीडीया केन�द�र"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "ध�वनि और वीडीयो के खेलने वाले/संपादन करने वाले कार�यक�रम"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "इन�टरनेट केन�द�र"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -404,205 +515,205 @@ msgstr ""
 "विपत�र और समाचारों को प�ने और भेजने के लि�  (मट, टिन...) और वेब को ब�राउज़ करने के लि� "
 "औज़ारों का समूह"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "नेटवर�क कम�प�यूटर (ग�राहक)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "�स०�स०�च० को शामिल करते ह�� विभिन�न प�रोटोकॉलों के लि� ग�राहक"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "आपके कम�प�यूटर की संरचना कार�य को सहज बनाने हेत� अनेक औजार"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "कन�सोल के औज़ार"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "विकास"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "प�रलेखन"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "�ल०�स०बी०"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "लिनक�स मानकीकरण आधार ! त�रितीय पक�ष कार�यक�रमों को समर�थन"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "वेब सर�वर"
 
-#: share/meta-task/compssUsers.pl:73
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:80
+#, c-format
 msgid "Apache"
-msgstr "रास�ता"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "ग�र�पवेयर"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "कोलाब सर�वर"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "अग�नि-भीतिका/रूटर"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "इन�टरनेट गेटवे"
 
-#: share/meta-task/compssUsers.pl:84
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:92
+#, c-format
 msgid "Mail/News"
-msgstr "/संचिका (F)/नवीन (_N)"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:85
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:93
+#, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "पोस�टफ़िक�स विपत�र सर�वर"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:88
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:97
+#, c-format
 msgid "Directory Server"
-msgstr "निर�देशिका जिससे प�नःस�थापन करना है"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:92
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:102
+#, c-format
 msgid "FTP Server"
-msgstr "�न०टी०पी० सर�वर"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:107
+#, c-format
 msgid "DNS/NIS"
-msgstr "डी�न�स"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:97
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:108
+#, c-format
 msgid "Domain Name and Network Information Server"
-msgstr "डोमेन नाम सर�वर"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:100
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:112
+#, c-format
 msgid "File and Printer Sharing Server"
-msgstr "प�रिंटर सर�वर"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:101
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:113
+#, c-format
 msgid "NFS Server, Samba server"
-msgstr "सॉबा सर�वर"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "डाटाबेस"
 
-#: share/meta-task/compssUsers.pl:105
-#, fuzzy, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "पोस�टग�रीसीक�यूअल या माईसीक�यूअल डाटाबेस सर�वर"
+#: share/meta-task/compssUsers.pl:118
+#, c-format
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "वेब/�फ़०टी०पी०"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "आपाचे, प�रो-�फ़०टी०पी०डी०"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "विपत�र"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "पोस�टफ़िक�स विपत�र सर�वर"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
+msgid "PostgreSQL or MariaDB database server"
 msgstr "पोस�टग�रीसीक�यूअल या माईसीक�यूअल डाटाबेस सर�वर"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "नेटवर�क कम�प�यूटर सर�वर"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "�न०�फ़०�स० सर�वर, �स०�म०बी० सर�वर, प�रोक�सी सर�वर, �स०�स०�च० सर�वर"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "सचित�र वातावरण"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "केडीई कार�यकेन�द�र"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "गनोम कार�यकेन�द�र"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -610,68 +721,124 @@ msgid ""
 msgstr ""
 "�क सचित�र वातावरण, उपयोगकर�ता-मित�रवत कार�यक�रमों के सम�च�चय और डेस�कटाप औजारों के साथ"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "डेस�कटाप"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"�क सचित�र वातावरण, उपयोगकर�ता-मित�रवत कार�यक�रमों के सम�च�चय और डेस�कटाप औजारों के साथ"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "अन�य सचित�र डेस�कटाप"
 
-#: share/meta-task/compssUsers.pl:150
-#, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "आईसीडब�लू�म, विण�डो मेकर, �नलाइटमेन�ट, �फ़वीडब�लू�म, इत�यादि"
+#: share/meta-task/compssUsers.pl:200
+#, c-format
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "यूटिलिटीज़"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "�स�स�च सर�वर"
 
-#: share/meta-task/compssUsers.pl:180
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:230
+#, c-format
 msgid "Webmin"
-msgstr "वेबकैम"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:181
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:231
+#, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "टर�मिनल सर�वर संरचना"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:185
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:235
+#, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "नेटवर�क मॉनीट�रिंग"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:240
+#, c-format
 msgid "Mageia Wizards"
-msgstr "<b>मैनड�रिव स�टोर</b>"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:191
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:241
+#, c-format
 msgid "Wizards to configure server"
-msgstr "\"%s\" प�रिंटर की संरचना में असफ़ल !"
+msgstr ""
 
 #: steps.pm:85
 #, c-format
@@ -683,7 +850,7 @@ msgstr ""
 "किया जायें ।\n"
 "अपने जोखिम पर जारी रहें । "
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -703,332 +870,328 @@ msgstr "`%s' चरण में प�रवेश \n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "मैनड�रिव लिनक�स संसाधन %s"
+msgid "%s Installation %s"
+msgstr ""
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> इकाईयों के मध�य "
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"आपका सिस�टम साधनों के अभाव से ग�रसित है । मैनड�रिव लिनक�स को संसाधित करने में, \n"
-"आपको क�छ समस�या हो सकती है । यदि �सा होता है, तो आप इसके बजाय �क पाठ-संसाधनको करके "
-"देख सकते है, �सा करने के लि�, \n"
-"सीडीरॉम से बूट होने के समय `F1' को दबायें, और फ़िर `text' को इन�टर करें ।"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr ""
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "निम�नतम संसाधन"
+msgstr ""
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "डेस�कटाप"
+msgstr ""
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "डेस�कटाप"
+msgstr ""
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "डेस�कटाप"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "पैकेज समूह चयन"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "अलग-अलग पैकेजों का चयन"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "क�ल आकार: %d / %d �म०बी०"
+msgid "Unselect All"
+msgstr "सभी को अचयनित करें"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "निकृष�ट पैकेज"
+msgid "Total size: %d / %d MB"
+msgstr "क�ल आकार: %d / %d �म०बी०"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "संस�मरण: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "आकार:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d केबी\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "महत�ता: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "आप इस पैकज को चयनित/अचयनित नहीं कर सकते है"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s विल�प�त होने के कारण"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "असन�त�ष�ट %s के कारण"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s को प�रोत�साहित करने का प�रयास"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s को रखने के लि�"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "आप इस पैकज का चयन नहीं कर सकते है क�योंकि और अधिक स�थान संसाधन के लि� नहीं बचा है"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "निम�नलिखित पैकजों का संसाधन होने जा रहा है"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "निम�नलिखित पैकेजों को हटाया जाने वाला है"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "यह �क अति आवश�यक पैकेज है, इसे अचयनित नहीं किया जा सकता है"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "आप इस पैकेज को अचयनित नहीं कर सकते है । इसे पहिले से ही संसाधित किया जा च�का है"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "इस पैकज को अचयनित नहीं करा जा सकता है । इसे उन�नयन किया जाना चाहि�"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "स�वतः चयनित पैकेजों को दिखायें"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "संसाधन"
 
-#: steps_gtk.pm:499
-#, fuzzy, c-format
+#: steps_gtk.pm:515
+#, c-format
 msgid "Load/Save selection"
-msgstr "पैकेज चयन"
+msgstr ""
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "चयनित पैकेजों का उन�नयन किया जा रहा है"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "निम�नतम संसाधन"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "सॉफ़�टवेयर प�रबंधक"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "उन पैकेजों का चयन करें जिन�हें आप संसाधित करना चाहते है"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "संसाधन हो रहा है"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "कोई विवरण नहीं"
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "शेष समय"
+msgstr ""
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "अन�मान लगाया जा रहा है"
+msgstr ""
 
-#: steps_gtk.pm:615
-#, fuzzy, c-format
+#: steps_gtk.pm:631
+#, c-format
 msgid "%d package"
 msgid_plural "%d packages"
-msgstr[0] "%d पैकेज"
-msgstr[1] "%d पैकेज"
+msgstr[0] ""
+msgstr[1] ""
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "सारांश"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "संरचना"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "संरचित नहीं"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "पैकेज समूह चयन"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "�क त�र�टि हो गयी है"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "कृपया अपने की-बोर�ड खाका का चयन करें ।"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "यह है उपलब�ध देशों की सम�पूर�ण सूची"
+msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "संसाधन/उन�नयन"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "यह �क संसाधन या �क उन�नयन है?"
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "संसाधन"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "उन�नयन %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s के लि� गू�लिखित क��जी"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "संसाधन हो रहा है"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1037,116 +1200,90 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "आई०डी०ई०"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "आईडीई की संरचना की जा रही है"
 
-#: steps_interactive.pm:290
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"१ �मबी बूटस�ट�रैप के लि� कोई म�क�त स�थान नहीं ! संसाधन जारी रहेगा, परन�त� आपके तंत�र को बूट "
-"करने के लि�, आपको डिस�कड�रैक से �क बूटस�ट�रैप विभाजन का निर�माण करना होगा "
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"१ �मबी बूटस�ट�रैप के लि� कोई म�क�त स�थान नहीं ! संसाधन जारी रहेगा, परन�त� आपके तंत�र को बूट "
-"करने के लि�, आपको डिस�कड�रैक से �क बूटस�ट�रैप विभाजन का निर�माण करना होगा "
-
-#: steps_interactive.pm:371
-#, fuzzy, c-format
-msgid ""
 "Change your Cd-Rom!\n"
 "Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
 "done.\n"
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
-"अपनी सीडी-रॉम को परिवर�तित करें !\n"
-"\n"
-"कृपया \"%s\" लेबिल वाली सीडी-रॉम को अपनी ड�राइव में डालें और डालने के उपरान�त ठीक को "
-"दबायें ठीक को दबायें ।\n"
-"यदि आपके पास यह नहीं है, तो इस सीडी-रॉम से संसाधन ना करने के लि� निरस�त को दबायें ।"
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "उपलब�ध पैकेजों को खोज़ा जा रहा है..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
-#, fuzzy, c-format
+#: steps_interactive.pm:428
+#, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"कृपया चयन करें कि फ़�लापी पर पैकेजों को अधिभारण या स�रक�षित किया जायें ।\n"
-"इसका प�रारूप स�वतः_संसाधन के लि� निर�मित फ़�लापियों की भांति होता है ।"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "लोड"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "स�रक�षित"
 
-#: steps_interactive.pm:453
-#, fuzzy, c-format
+#: steps_interactive.pm:438
+#, c-format
 msgid "Bad file"
-msgstr "फ़ाइल लोड करें"
+msgstr ""
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "आई०डी०ई०"
+msgstr "के०डी०ई०"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "गनोम"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "पैकेज समूह चयन"
+msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "चयनित आकार उपलब�ध स�थान से ज�यादा है"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "संसाधन का प�रकार"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1155,87 +1292,111 @@ msgstr ""
 "आपने पैकेजों के किसी भी समूह का चयन नहीं किया है ।\n"
 "कृपया कम-से-कम जितना आप चाहते है उतने संसाधन का चयन करें:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "�क�स के साथ"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "%s पैकेज का संसाधन हो रहा है"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "आधार-भूत प�रलेखन के साथ (संस�त�ति की जाती है !)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "वास�तविक निम�नत�तम संसाधन (विशेषकर कोई यू०आर०पी०�म०आई० नहीं)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "संसाधन का निर�माण किया जा रहा है"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s पैकेज का संसाधन हो रहा है"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "पैकेजों के आदेश देने में �क त�र�टि हो गयी है:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "क�छ भी हो जारी रहा जायें?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
-#, fuzzy, c-format
+#: steps_interactive.pm:682
+#, c-format
 msgid "Go back to media and packages selection"
-msgstr "पैकेजों के चयन को स�रक�षित करें"
+msgstr ""
 
-#: steps_interactive.pm:683
-#, fuzzy, c-format
+#: steps_interactive.pm:685
+#, c-format
 msgid "There was an error installing package %s."
-msgstr "पैकेजों के संसाधन में �क त�र�टि हो गयी है:"
+msgstr ""
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "संसाधन-उपरान�त संरचना"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "उन�नयन"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1256,126 +1417,115 @@ msgstr ""
 "\n"
 "क�या आप इन अपडेटों को संसाधित करना चाहते है ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s पर %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "हार�डवेयर"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "सांउड कार�ड"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "क�या आपके पास �क आई०�स०�० सांउड कार�ड है?"
 
-#: steps_interactive.pm:921
-#, fuzzy, c-format
+#: steps_interactive.pm:931
+#, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
-msgstr "संसाधन के उपरान�त \"sndconfig\" को अपने साउण�ड कार�ड को संरचित करने के लि� चलायें"
+msgstr ""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "कोई साउण�ड कार�ड नहीं खोजा जा सका । संसाधन के उपरान�त \"harddrake\" को उपयोग करके देखें"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "सचित�र इन�टरफ़ेस"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "नेटवर�क और इन�टरनेट"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "प�रोक�सियां"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "संरचित"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "स�रक�षा स�तर"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "अग�नि-भीतिका"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "सक�रिय है"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "निष�क�रिय"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "आपने �क�स को संरचित नहीं किया है ।  क�या आप वास�तव में �सा चाहते है?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "बूटलोडर को तैयार किया जा रहा है..."
+msgid "Preparing initial startup program..."
+msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, fuzzy, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"आपके पास लगता है कि �क प�राचीन जगत की या अज�ञात मशीन है,\n"
-"याबूट बूटलोडर आपके लि� कार�य नहीं करेगा ।\n"
-"संसाधन जारी रहेगा, परन�त� आपको अपनी मशीन को बूट करने के लि�, \n"
-"बूट-�क�स या किसी अन�य साधन की आवश�यकता होगी"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "इस स�रक�षा स�तर में, विण�डो विभाजन में संचिकाओं तक पह��च सिर�फ़ प�रबंधक को हीप�राप�त है।"
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s में �क खाली फ़�लापी डालें"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "स�वतः संसाधन फ़�लापी का निर�माण किया जा रहा है..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1386,12 +1536,12 @@ msgstr ""
 "\n"
 "क�या आप वास�तव में बाहर निकलना चाहते है?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "बधाई हो"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "रीबूट"
@@ -1407,7 +1557,7 @@ msgstr "भाषा"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "स�थानीयकरण"
 
 #: steps_list.pm:17
 #, c-format
@@ -1486,13 +1636,6 @@ msgid ""
 "Users"
 msgstr "उपयोगकर�ताओ"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "नेटवर�किंग"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1534,149 +1677,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "निकास"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "ऑफ़िस के कार�यक�रम: शब�दसंसाधक (केवर�ड, आबीवर�ड), स�प�रेडशीट (केस�प�रेड, जीन�यूमेरिक), "
-#~ "पीडी�फ़ अवलोक�क, इत�यादि"
-
-#, fuzzy
-#~ msgid "Downloading file %s..."
-#~ msgstr "संचिकायें प�रेषित की जा रही..."
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "आपने निम�नलिखित सर�वर(सर�वरो) का चयन किया है: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "इन सर�वरों को डिफ़ाल�ट के तौर पर सक�रिय किया जाता है । इनमें कोई ज�ञात स�रक�षा-संबंधी "
-#~ "खामी नहीं है,\n"
-#~ "परन�त� क�छ नये दोष मिल सकते है । �सी अवस�था में, अति शीघ�र-से-शीघ�र\n"
-#~ "जितना सम�भव हो, आप उनन�यन कर लें।\n"
-#~ "\n"
-#~ "\n"
-#~ "क�या आप वास�तव में इन सर�वरों को संसाधित करना चाहते है?\n"
-
-#, fuzzy
-#~ msgid "IceWm Desktop"
-#~ msgstr "डेस�कटाप"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr ""
-#~ "उपलब�ध पैकेजों की सूची प�राप�त करने के लि� मिरर से सम�पर�क स�थापित किया जा रहा है..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "%s मिरर प�रणाली से संबंध स�थापित करने में असमर�थ"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "स�वतः संसाधान फ़�लापी का निर�माण किया जा रहा है"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "यदि आवश�यकता हो तो स�वतः संसाधन को पूर�णतया स�वचालित बनाया जा सकता है,\n"
-#~ "�सी अवस�था में यह हार�ड ड�राइव पर पूर�ण अधिकार कर लेगा !!\n"
-#~ "(यह समान संसाधन को अन�य मशीन पर संसाधित करने के लि� होता है)।\n"
-#~ "\n"
-#~ "आप हो सकता है कि संसाधन को रीप�ले करन चाहते हो।\n"
-
-#~ msgid "Replay"
-#~ msgstr "प�नः चलाना"
-
-#~ msgid "Automated"
-#~ msgstr "स�वचालित"
-
-#~ msgid "Save packages selection"
-#~ msgstr "पैकेजों के चयन को स�रक�षित करें"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "क�या आप �बूट का का उपयोग करना चाहते है?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "�क बूट को संसाधित करने में त�र�टि, \n"
-#~ "संसाधन को बलपूर�वक करने का प�रयास करे, चाहे कि प�रथम विभाजन नष�ट हो जायें?"
-
-#~ msgid "All"
-#~ msgstr "सभी"
-
-#~ msgid "TV card"
-#~ msgstr "टीवी कार�ड"
-
-#~ msgid "Boot"
-#~ msgstr "बूट"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "प�रमाणीकरण"
-
-#~ msgid "Gwenview"
-#~ msgstr "ग�वेनव�यू"
-
-#~ msgid "DrakVPN"
-#~ msgstr "ड�रैक वीपी�न"
-
-#, fuzzy
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "%d पैकेज"
-#~ msgstr[1] "%d पैकेज"
-
-#~ msgid "%d packages"
-#~ msgstr "%d पैकेज"
-
-#~ msgid "Language"
-#~ msgstr "भाषा"
-
-#~ msgid "License"
-#~ msgstr "प�रमाण-पत�र"
-
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "संसाधन प�रकार का चयन करें"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "अन�मान लगाया जा रहा है"
-
-#, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "संसाधन करने हेत� पैकेजों का चयन करें"
-
-#~ msgid "Users"
-#~ msgstr "उपयोगकर�ताओ"
-
-#~ msgid "Networking"
-#~ msgstr "नेटवर�किंग"
-
-#~ msgid "Configure X"
-#~ msgstr "�क�स को संरचित करें"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "आपके कर�नल के अन�रूप कर�नल मॉडयूलो तक नहीं पह��चा जा सकता है ( %s संचिका विल�प�त है),"
-#~ "इसका सामान�यता अर�थ है कि आपकी बूट फ़�लापी संसाधन माध�यम के साथ ताल-बद�व नहीं है(कृपया "
-#~ "�क और नयी बूट फ़�लापी का निर�माण करें)"
diff --git a/perl-install/install/share/po/hr.po b/perl-install/install/share/po/hr.po
index e1c4126d0..2b242b227 100644
--- a/perl-install/install/share/po/hr.po
+++ b/perl-install/install/share/po/hr.po
@@ -1,54 +1,81 @@
-# Translation of DrakX to Croatian
-# Copyright (C) Croatian team
-# Translators: Danijel Studen <dstuden@vuka.hr>,Denis Lackovic <delacko@fly.srk.fer.hr>,Jerko Škifić <skific@riteh.hr>,Ljubomir Božić <ljubo108@vip.hr>,Nikola Planinac <>,Robert Vuković <robi@surfer.hr>,Sasa Poznanovic <sasa.poznanovic@vuka.hr>,Vedran Vyroubal <vedran.vyroubal@inet.hr>,Vinko Prelac <vinko@buka.hr>,Vlatko Kosturjak <kost@linux.hr>,Zoran Jankovic <zoran.jankovic@inet.hr>,
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX 0\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2005-01-04 21:25+CET\n"
-"Last-Translator: auto\n"
-"Language-Team: Croatian <lokalizacija@linux.hr>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-26 19:01+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/mageia/language/"
+"hr/)\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: TransDict server\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
-#, fuzzy, c-format
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
+#, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Da li imate još koji?"
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -57,114 +84,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
-#, fuzzy, c-format
+#: any.pm:163
+#, c-format
 msgid "Network (HTTP)"
-msgstr "Mreža"
+msgstr ""
 
-#: any.pm:122
-#, fuzzy, c-format
+#: any.pm:164
+#, c-format
 msgid "Network (FTP)"
-msgstr "Mreža"
+msgstr ""
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Kontaktiram Mageia Linux web site za dobivanje popisa raspoloživih mirrora"
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Kontaktiram %s web site za dobivanje popisa raspoloživih mirrora"
 
-#: any.pm:187
-#, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+#: any.pm:253
+#, c-format
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Kontaktiram Mageia Linux web site za dobivanje popisa raspoloživih mirrora"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Izaberite mirror sa kojeg želite skinuti pakete"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Direktorij"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
-#, fuzzy, c-format
+#: any.pm:369
+#, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
-msgstr "Ne mogu otvoriti %s: %s\n"
+msgstr ""
 
-#: any.pm:334
-#, fuzzy, c-format
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
+#, c-format
 msgid "Looking at packages already installed..."
-msgstr "Ne možete odzna�iti ovaj paket budući da je već instaliran"
+msgstr ""
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Tražim pakete koje mogu nadograditi"
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -173,87 +263,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Greška prilikom �itanja datoteke %s"
 
-#: any.pm:1020
-#, fuzzy, c-format
+#: any.pm:1304
+#, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "Slijedeći paketi će biti instalirani"
+msgstr ""
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
-#, fuzzy, c-format
+#: any.pm:1363
+#, c-format
 msgid "NFS"
-msgstr "FS"
+msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Mreža"
 
-#: any.pm:1102
-#, fuzzy, c-format
+#: any.pm:1386
+#, c-format
 msgid "Please choose a media"
-msgstr "Molim odaberite"
+msgstr ""
 
-#: any.pm:1118
-#, fuzzy, c-format
+#: any.pm:1402
+#, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "Datoteka već postoji. Da li da nju upotrijebim?"
+msgstr ""
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Pristup odbijen"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
-#, fuzzy, c-format
+#: any.pm:1475
+#, c-format
 msgid "Bad media %s"
-msgstr "dodan medij %s"
+msgstr ""
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Ne mogu napraviti screenshotove prije particioniranja"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Screenshotovi će biti raspoloživi poslije instalaciju u %s"
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
-msgstr "Instaliram"
+msgstr ""
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Postavke"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Morate također formatirati %s"
@@ -277,25 +367,25 @@ msgstr "Podižem mrežu"
 msgid "Bringing down the network"
 msgstr "Onemogućujem mrežu"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr ""
+msgstr "nije moguće dodati medij"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
-#, fuzzy, c-format
+#: media.pm:805
+#, c-format
 msgid "Copying in progress"
-msgstr "detektiran na portu %s"
+msgstr "Kopiranje u tijeku"
 
 #: pkgs.pm:32
 #, c-format
@@ -322,268 +412,291 @@ msgstr "lijepo"
 msgid "maybe"
 msgstr "možda"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Bez opisa"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "Pojavila se greška"
+msgstr "Došlo je do greške:"
 
-#: pkgs.pm:814
-#, fuzzy, c-format
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Nastupila je kobna pogreška: %s. "
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Ne pitaj ponovo"
+
+#: pkgs.pm:911
+#, c-format
 msgid "%d installation transactions failed"
-msgstr "instalacijske intrukcije"
+msgstr ""
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "Instaliram paket %s"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Radna stanica"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Uredska radna stanica"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Uredski programi: tekst procesori (OpenOffice.org Writer, Kword), tabli�ni "
-"kalkulatori (OpenOffice.org Calc, Kspread), pdf preglednici, itd"
+"Uredski programi: tekst procesori (LibreOffice Writer, Kword), tabli�ni "
+"kalkulatori (LibreOffice Calc, Kspread), pdf preglednici, itd"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Igra�ka radna stanica"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zabavni programi: arkade, plo�e, strategije, itd"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedijska stanica"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Zvu�ni i video svira�ki/uređiva�ki programi"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet stanica"
 
-#: share/meta-task/compssUsers.pl:33
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:37
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
-"Pribor alata za �itanje i slanje mail-a i news-a (pine, mutt, tin..) i za "
-"pregled Web-a"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Mrežno ra�unalo (klijent)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, 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:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Alati za lako podešavanje vašeg ra�unala"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konzolni Alati"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Uređiva�i, ljuske, datote�ni alati, terminali"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Razvoj"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C i C++ razvojne biblioteke, programi i uklju�ujuće datoteke"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Knjige i Howto-i o Linux-u i slobodnom software-u"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Posljužitelj weba"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:85
+#, c-format
 msgid "Kolab Server"
-msgstr "NIS Poslužitelj"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Vatrozid/Ruter"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet gateway"
 
-#: share/meta-task/compssUsers.pl:84
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:92
+#, c-format
 msgid "Mail/News"
-msgstr "/Datoteka/_Nova"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix mail poslužitelj, Inn news poslužitelj"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Poslužitelj imenika"
 
-#: share/meta-task/compssUsers.pl:92
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:102
+#, c-format
 msgid "FTP Server"
-msgstr "NTP Poslužitelj"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:107
+#, c-format
 msgid "DNS/NIS"
-msgstr "DNS/NIS "
+msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Ime Domene i Mrežni Informacijki Poslužitelj (NIS)"
 
-#: share/meta-task/compssUsers.pl:100
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:112
+#, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Ispisni poslužitelj"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:101
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:113
+#, c-format
 msgid "NFS Server, Samba server"
-msgstr "NIS Poslužitelj"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Baza podataka"
 
-#: share/meta-task/compssUsers.pl:105
-#, fuzzy, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL ili MySQL poslužitelj baza"
+#: share/meta-task/compssUsers.pl:118
+#, c-format
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache i Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Pošta"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix poslužitelj pošte"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ili MySQL poslužitelj baza"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL ili MariaDB poslužitelj baza"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Mrežni ra�unalni poslužitelj"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS poslužitelj, SMB poslužitelj, Proxy poslužitelj, SSH poslužitelj"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafi�ko Okružje"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE radna stanica"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -591,12 +704,12 @@ msgid ""
 msgstr ""
 "K Radno Okružje, osnovno grafi�ko okružje sa kolekcijom pripadajućih alata"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome radna stanica"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -605,69 +718,124 @@ msgstr ""
 "Grafi�ka okružja sa korisni�ki prijateljskim skupom aplikacija i alatima za "
 "radno okružje"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "Radna površina"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Grafi�ka okružja sa korisni�ki prijateljskim skupom aplikacija i alatima za "
-"radno okružje"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Druga grafi�ka radna okružja"
 
-#: share/meta-task/compssUsers.pl:150
-#, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd"
+#: share/meta-task/compssUsers.pl:200
+#, c-format
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Pomoćni programi"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
+#, c-format
 msgid "SSH Server"
-msgstr "NIS Poslužitelj"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:180
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:230
+#, c-format
 msgid "Webmin"
-msgstr "Servisi"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:181
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:231
+#, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Prebaci postavke pisa�a"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:185
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:235
+#, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Mrežne postavke"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:240
+#, c-format
 msgid "Mageia Wizards"
-msgstr "Mageia Linux Kontrolni Centar"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:191
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:241
+#, c-format
 msgid "Wizards to configure server"
-msgstr "Podešavam pisa� \"%s\" ..."
+msgstr ""
 
 #: steps.pm:85
 #, c-format
@@ -678,7 +846,7 @@ msgstr ""
 "Dogodila se greška, ali neznam kako s njom lijepo rukovati.\n"
 "Nastavite dalje na vlastiti rizik."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -698,334 +866,334 @@ msgstr "Pokrećem korak `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux instalacija %s"
+msgid "%s Installation %s"
+msgstr "%s instalacija %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> između elemenata"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vaš sustav je slab na resursima. Možete imati nekih problem prilikom\n"
-"instalacije Mageia Linux-a. Ukoliko se to desi, možete probati tekstualnu\n"
+"instalacije %s-a. Ukoliko se to desi, možete probati tekstualnu\n"
 "instalaciju. Za to, pritisnite `F1' kada podižete CDROM, i unesite `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Media Selection"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr ""
+
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "Minimalna instalacija"
+msgstr ""
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "Radna površina"
+msgstr "KDE "
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "Radna površina"
+msgstr "GNOME radno okruženje"
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "Radna površina"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Odabir grupe paketa"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Individualan odabir paketa"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Ukupna veli�ina: %d / %d MB"
+msgid "Unselect All"
+msgstr "Odselektiraj sve"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Loš paket"
+msgid "Total size: %d / %d MB"
+msgstr "Ukupna veli�ina: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Ina�ica: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Veli�ina: "
 
-#: steps_gtk.pm:406
-#, fuzzy, c-format
+#: steps_gtk.pm:422
+#, c-format
 msgid "%d KB\n"
-msgstr "Veli�ina: %d KB\n"
+msgstr ""
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Zna�aj: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Ne možete ozna�iti/odzna�iti ovaj paket"
 
-#: steps_gtk.pm:445
-#, fuzzy, c-format
+#: steps_gtk.pm:462
+#, c-format
 msgid "due to missing %s"
-msgstr "kdesu nedostaje"
+msgstr ""
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zbog nezadovoljavajućeg %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "odabirem %s izabiranjem datoteka"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "kako bi se zadržalo %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Ne možete ozna�iti ovaj paket budući da nema dovoljno mjesta gdje ga se može "
 "instalirati"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Slijedeći paketi će biti instalirani"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Slijedeći paketi će biti uklonjeni"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Budući da je ovo obvezni paket ne možete ga odzna�iti"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Ne možete odzna�iti ovaj paket budući da je već instaliran"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Ne možete odzna�iti ovaj paket budući da ga treba nadograditi"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Prikaži automatski odabrane pakete"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instaliraj"
 
-#: steps_gtk.pm:499
-#, fuzzy, c-format
+#: steps_gtk.pm:515
+#, c-format
 msgid "Load/Save selection"
-msgstr "Premjesti ozna�eno"
+msgstr ""
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Dograđujem izbor paketa"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimalna instalacija"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Upravitelj Softwareom"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Odaberite pakete koje želite instalirati"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instaliram"
 
-#: steps_gtk.pm:565
-#, fuzzy, c-format
+#: steps_gtk.pm:581
+#, c-format
 msgid "No details"
-msgstr "Detalji"
+msgstr ""
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "Preostalo vrijeme"
+msgstr ""
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "Procjenjujem"
+msgstr ""
 
-#: steps_gtk.pm:615
-#, fuzzy, c-format
+#: steps_gtk.pm:631
+#, c-format
 msgid "%d package"
 msgid_plural "%d packages"
-msgstr[0] "%d paketa"
-msgstr[1] "%d paketa"
-msgstr[2] "%d paketa"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Sažetak"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Podešavanje"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
-#, fuzzy, c-format
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
+#, c-format
 msgid "not configured"
-msgstr "ponovno postavi"
-
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Odabir grupe paketa"
+msgstr ""
 
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Pojavila se greška"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Molim, izaberite raspored tipkovnice"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "Ovdje je cijeli popis raspoloživih tipkovnica"
+msgstr ""
 
-#: steps_interactive.pm:146
-#, fuzzy, c-format
+#: steps_interactive.pm:153
+#, c-format
 msgid "Install/Upgrade"
-msgstr "Instaliraj/Nadogradi"
+msgstr ""
 
-#: steps_interactive.pm:150
-#, fuzzy, c-format
+#: steps_interactive.pm:157
+#, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "Da li je ovo instalacija ili nadogradnja?"
+msgstr ""
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instaliraj"
 
-#: steps_interactive.pm:154
-#, fuzzy, c-format
+#: steps_interactive.pm:161
+#, c-format
 msgid "Upgrade %s"
-msgstr "Dogradnja"
+msgstr ""
 
-#: steps_interactive.pm:172
-#, fuzzy, c-format
+#: steps_interactive.pm:184
+#, c-format
 msgid "Encryption key for %s"
-msgstr "Enkripcijski klju�"
+msgstr ""
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "Instaliram"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1034,119 +1202,90 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Podešavam IDE"
 
-#: steps_interactive.pm:290
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Nema slobodnog mjesta za 1 MB bootstrap! Instalacija će nastaviti, ali za "
-"podizanje vašeg sustava, trebati ćete napraviti bootstrap particiju u "
-"DiskDrake-u"
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Nema slobodnog mjesta za 1 MB bootstrap! Instalacija će nastaviti, ali za "
-"podizanje vašeg sustava, trebati ćete napraviti bootstrap particiju u "
-"DiskDrake-u"
-
-#: steps_interactive.pm:371
-#, fuzzy, c-format
-msgid ""
 "Change your Cd-Rom!\n"
 "Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
 "done.\n"
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
-"Promjenite vaš Cd-Rom!\n"
-"\n"
-"Ubacite Cd-Rom ozna�en \"%s\" u vaš pogon i pritisnite U redu kada "
-"završite.\n"
-"Ukoliko ga nemate, pritisnite Odustani kako bi izbjegli instalaciju sa ovog "
-"Cd-Rom-a."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Tražim dostupne pakete"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
-#, fuzzy, c-format
+#: steps_interactive.pm:428
+#, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"Molimo izaberite u�itivanje ili spremanje izbora paketa na disketu.\n"
-"Format je isto kao auto_install napravljene diskete."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "U�itaj"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Spremi"
 
-#: steps_interactive.pm:453
-#, fuzzy, c-format
+#: steps_interactive.pm:438
+#, c-format
 msgid "Bad file"
-msgstr "U�itaj datoteku"
+msgstr ""
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "Odabir grupe paketa"
+msgstr "Odabir radnog okruženja"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Izabrana veli�ina je veća nego raspoloživ prostor"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tip instalacije"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1155,88 +1294,112 @@ msgstr ""
 "Niste izabrali niti jednu grupu paketa\n"
 "Izaberite minimalnu instalaciju ako želite"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Sa X-ima"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Instaliram paket %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Sa osnovnom dokumentacijom (preporu�eno!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Stvarno malena instalacija (posebice bez urpmia)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Pripremam instalaciju"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instaliram paket %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Javila se greška prilikom sortiranja paketa:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Da ipak nastavim?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Pokušaj ponovno"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
-#, fuzzy, c-format
+#: steps_interactive.pm:682
+#, c-format
 msgid "Go back to media and packages selection"
-msgstr "Spremi odabir paketa"
+msgstr ""
 
-#: steps_interactive.pm:683
-#, fuzzy, c-format
+#: steps_interactive.pm:685
+#, c-format
 msgid "There was an error installing package %s."
-msgstr "Pojavila se greška kod instalacije paketa:"
+msgstr ""
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Postava nakon instalacije"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Nadogradnje"
 
-#: steps_interactive.pm:738
-#, fuzzy, c-format
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
+#, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
 "have been updated after the distribution was released. They may\n"
@@ -1247,136 +1410,116 @@ msgid ""
 "\n"
 "Do you want to install the updates?"
 msgstr ""
-"Imate mogućnost skidanja (downloada) paketa za dogradnju koji su\n"
-"izašli poslije nego što je distribucija postala raspoloživa.\n"
-"\n"
-"Dobit ćete sigurnosne popravke i popravke od grešaka, ali za nastavak\n"
-"trebate imati podešenu Internet vezu.\n"
-"\n"
-"Da li želite instalirati dogradnju?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Sklopovlje"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Zvu�na kartica"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Da li imate ISA zvu�nu karticu?"
 
-#: steps_interactive.pm:921
-#, fuzzy, c-format
+#: steps_interactive.pm:931
+#, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
-"Pokrenite \"sndconfig\" poslije instalacije za podešavanje vaše zvu�ne "
-"kartice"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Nije pronađena zvu�na kartica. Probajte \"harddrake\" poslije instalacije"
 
-#: steps_interactive.pm:931
-#, fuzzy, c-format
+#: steps_interactive.pm:941
+#, c-format
 msgid "Graphical interface"
-msgstr "X kod pokretanja sustava"
+msgstr ""
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Mreža i Internet"
 
-#: steps_interactive.pm:949
-#, fuzzy, c-format
+#: steps_interactive.pm:960
+#, c-format
 msgid "Proxies"
-msgstr "Profil: "
+msgstr ""
 
-#: steps_interactive.pm:950
-#, fuzzy, c-format
+#: steps_interactive.pm:961
+#, c-format
 msgid "configured"
-msgstr "ponovno postavi"
+msgstr ""
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Sigurnosna Razina"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Vatrozid"
 
-#: steps_interactive.pm:983
-#, fuzzy, c-format
+#: steps_interactive.pm:995
+#, c-format
 msgid "activated"
-msgstr "Aktiviraj sada"
+msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "onemogućeno"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Pripremam bootloader"
+msgid "Preparing initial startup program..."
+msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, fuzzy, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"ÄŒini se da imate OldWorld ili Nepoznato\n"
-" ra�unalo, yaboot bootloader neće moći raditi kod vas.\n"
-"Instalacija će nastaviti, ali ćete morati\n"
-" koristiti BootX da podignete vaše ra�unalo"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Umetnite praznu disketu u pogon %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Pravim auto instalacijsku disketu"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1387,12 +1530,12 @@ msgstr ""
 "\n"
 "Želite li zaista završiti?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "ÄŒestitamo, pobijedili ste!"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Ponovno pokretanje sustava"
@@ -1408,7 +1551,7 @@ msgstr "Jezik"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "Lokalizacija"
 
 #: steps_list.pm:17
 #, c-format
@@ -1487,13 +1630,6 @@ msgid ""
 "Users"
 msgstr "Korisnici"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Mreža"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1535,147 +1671,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Izađi"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Uredski programi: tekst procesori (kword, abiword), tabli�ni kalkulatori "
-#~ "(kspread, gnumeric), pdf preglednici, itd"
-
-#, fuzzy
-#~ msgid "Downloading file %s..."
-#~ msgstr "Å aljem datoteke..."
-
-#, fuzzy
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Izabrali ste slijedeće poslužitelje: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Ti poslužitelji biti će postavljeno aktivirani. Oni nemaju poznatih "
-#~ "sigurnosnih\n"
-#~ "propusta, ali neki novi mogu biti pronađeni. U tom slu�aju, morate ga "
-#~ "nadograditi\n"
-#~ "što prije moguće.\n"
-#~ "\n"
-#~ "\n"
-#~ "Da li zaista želite instalirati te poslužitelje?\n"
-
-#, fuzzy
-#~ msgid "IceWm Desktop"
-#~ msgstr "Radna površina"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "Spajam se na mirror kako bih pribavio popis dostupnih paketa"
-
-#, fuzzy
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Ne mogu napraviti fork: %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Napravi auto instalacijsku disketu"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "Auto instalacija može biti potpuno automatska ukoliko želite,\n"
-#~ "u tom slu�aju će preuzeti hard disk!!\n"
-#~ "(ovo zna�i za instalaciju na drugo ra�unalo).\n"
-#~ "\n"
-#~ "Možete preferirati da ponovite instalaciju.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Ponovi"
-
-#~ msgid "Automated"
-#~ msgstr "Automatski"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Spremi odabir paketa"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Da li želite koristiti aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Greška prilikom instalacije aboot-a, \n"
-#~ "probati nasilno instalirati iako to može uništiti prvu particiju?"
-
-#~ msgid "All"
-#~ msgstr "Sve"
-
-#~ msgid "TV card"
-#~ msgstr "TV kartica"
-
-#~ msgid "Boot"
-#~ msgstr "Pokretani sustav"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Provjera autenti�nosti"
-
-#, fuzzy
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "%d paketa"
-#~ msgstr[1] "%d paketa"
-#~ msgstr[2] "%d paketa"
-
-#~ msgid "%d packages"
-#~ msgstr "%d paketa"
-
-#~ msgid "Language"
-#~ msgstr "Jezik"
-
-#~ msgid "License"
-#~ msgstr "Licenca"
-
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "Odaberite razred instalacije"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "Procjenjujem"
-
-#, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "Izabir instaliranih paketa"
-
-#~ msgid "Users"
-#~ msgstr "Korisnici"
-
-#~ msgid "Networking"
-#~ msgstr "Mreža"
-
-#~ msgid "Configure X"
-#~ msgstr "Podesi X"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "Ne mogu pristupiti kernel modulima koji odgovaraju vašem kernelu "
-#~ "(datoteka %s nedostaje), ovo obi�no zna�i da vaša disketa za dizanje "
-#~ "sustava nije usklađena sainstalacijskim medijem (napravite noviju boot "
-#~ "disketu)"
diff --git a/perl-install/install/share/po/hu.po b/perl-install/install/share/po/hu.po
index e4694c77e..a8e60426c 100644
--- a/perl-install/install/share/po/hu.po
+++ b/perl-install/install/share/po/hu.po
@@ -1,60 +1,84 @@
-# translation of DrakX to Hungarian
-# Copyright (C) 2000-2001,2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Emese Kovacs <emese@gnome.hu>, 2000-2001.
-# Arpad Biro <biro.arpad gmail>, 2000, 2003, 2004, 2005, 2006, 2007.
-# Tamas Szanto <tszanto@mol.hu>, 2001.
-# Gergely Lonyai <aleph@mandriva.org>, 2007,2008,2009.
+# Translators:
+# Arpad Biro <biro.arpad gmail>, 2000,2003-2007
+# alephlg <aleph@mandriva.org>, 2007-2009
+# Tamas Szanto <tszanto@mol.hu>, 2001
+# Zoltan Siposs <zoltan.siposs@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-2010.0\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-10-06 09:55+0100\n"
-"Last-Translator: Gergely Lónyai <aleph@mandriva.org>\n"
-"Language-Team: Hungarian <aleph@mandriva.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-11-21 14:46+0000\n"
+"Last-Translator: Zoltan Siposs <zoltan.siposs@gmail.com>\n"
+"Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/"
+"language/hu/)\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Hungarian\n"
-"X-Poedit-Country: HUNGARY\n"
-"X-Poedit-SourceCharset: utf-8\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Az Ön munkaasztala egy USB kulcson"
+msgid "Join Us!"
+msgstr "Csatlakozz!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "A 100%%-ban nyílt forráskódú Mageia Linux disztribúció"
+msgid "Make it yours!"
+msgstr "Legyen a tiéd!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "A Linux könnyed kipróbálása: Mageia One"
+msgid "Your choice!"
+msgstr "A te választásod!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Egy teljes Mageia Linux munkaasztal, támogatással"
+msgid "Office tools"
+msgstr "Irodai eszközök"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: disztribúciók minden igényre"
+msgid "Home entertainment"
+msgstr "Otthoni szórakoztatás"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Gyerekeknek"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "A családnak!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Fejlesztőknek!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Köszönjük!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Légy szabad!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Van további kiegészítő adathordozója?"
+msgstr "Van további kiegészítő adathordozó?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -66,118 +90,192 @@ msgstr ""
 "telepítéshez: %s.\n"
 "\n"
 "\n"
-"Van beállítandó kiegészítő telepítési adathordozója?"
+"Van beállítandó kiegészítő telepítési adathordozó?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Hálózat (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Hálózat (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Hálózat (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "A tükörkiszolgáló címe?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Az URL-nek ftp:// vagy http:// előtaggal kell kezdődnie"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Kapcsolódás a Mageia Linux webkiszolgálójához; az elérhető tükörkiszolgálók "
-"listájának lekérdezése..."
+"Kapcsolódás a %s webkiszolgálójához; az elérhető tükörkiszolgálók listájának "
+"lekérdezése..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Nem sikerült lekérdezni az elérhető tükörkiszolgálók listáját a Mageia Linux "
+"Nem sikerült lekérdezni az elérhető tükörkiszolgálók listáját a %s "
 "webkiszolgálójától"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
-msgstr "Válasszon tükörkiszolgálót, ahonnan letölti a csomagokat"
+msgstr "Válassz tükörkiszolgálót a csomagok letöltéséhez!"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-beállítás"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Adja meg az NFS-adathordozó gépnevét és könyvtárát"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Gépnév hiányzik"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "A könyvtárnak \"/\" jellel kell kezdődnie"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Az NFS-csatolás gépneve?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Könyvtár"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Kiegészítő"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "A tükörkiszolgálón nem található fejléclista"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core tároló"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted tároló"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nem szabad tároló"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"A számítógépben található néhány eszköznek szüksége van nem szabad firmware-"
+"re annak érdekében, hogy a nyílt forrású meghajtóprogramok működhessenek."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "A \"%s\" engedélyezése szükséges."
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+"A \"%s\" a rendszer és az alkalmazások különböző összetevőit tartalmazza."
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "A \"%s\" nem szabad szoftvereket tartalmaz.\n"
+
+#: any.pm:477
+#, 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 ""
+"Különböző eszközök működéséhez szükséges firmware-ket is tartalmaz (pl. ATI/"
+"AMD videokártyák, hálózati kártyák, RAID vezérlők,...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"A \"%s\" olyan szoftvereket tartalmaz, amelyek a szoftver-szabadalmak miatt "
+"egyes országokban nem terjeszthetők."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"A \"%s\" tárolóból származó szoftvereket is tartalmaz, melyek további "
+"képességekkel lettek újrafordítva."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Itt lehet további adathordozókat engedélyezni."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Ez az adatforrás frissítőcsomagokat tartalmaz a \"%s\" számára."
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "A már telepített csomagok vizsgálata..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "A frissítendő csomagok keresése..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Csomagok eltávolítása a frissítés előtt..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -190,87 +288,87 @@ msgstr ""
 "\n"
 "Szeretné eltávolítani ezeket a csomagokat?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Hiba a(z) %s fájl olvasása közben"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "A következő lemezek át lettek nevezve:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (korábbi név: %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Hálózat"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Válasszon egy adatforrást"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "A fájl már létezik. Felülírja?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Hozzáférés megtagadva"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Helytelen NFS-név"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "\"%s\": hibás adatforrás"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Partícionálás előtt nem készíthetők képernyőfelvételek"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "A képernyőfelvételek a telepítés után itt lesznek elérhetők: %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Telepítés"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Beállítás"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Meg kell formázni ezt is: %s"
@@ -294,32 +392,26 @@ msgstr "A hálózatkezelés elindítása"
 msgid "Bringing down the network"
 msgstr "A hálózatkezelés leállítása"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Kérem várjon, fájl betöltése"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "sikertelen a csomagforrás hozzáadása"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Bizonyos csomagok lemezre másolása későbbi használatra"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Másolás folyamatban"
 
-# The "Importance" ratings:
-# 5: "must have"
-# 4: "important"
-# 3: "very nice"
-# 2: "nice"
-# 1: "maybe"
 #: pkgs.pm:32
 #, c-format
 msgid "must have"
@@ -345,7 +437,24 @@ msgstr "ajánlott"
 msgid "maybe"
 msgstr "opcionális"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Csomaginformációk olvasása az XML meta-adatokból..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Nincs xml információ a \"%s\" adatforráshoz, a %s csomagról csak részleges "
+"információit sikerült szerezni."
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Nincs leírás"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -354,66 +463,76 @@ msgstr ""
 "A(z) %s által kért bizonyos csomagok nem telepíthetők:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Hiba lépett fel:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Végzetes hiba történt: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Ne kérdezze mégegyszer"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d telepítési művelet nem sikerült"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Sikertelen csomagtelepítések:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Munkaállomás"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Irodai munkaállomás"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Irodai programok: szövegszerkesztők (OpenOffice.org Writer, KWord), "
-"táblázatkezelők (OpenOffice.org Calc, KSpread), PDF-megjelenítők, ..."
+"Irodai programok: szövegszerkesztők (LibreOffice Writer, KWord), "
+"táblázatkezelők (LibreOffice Calc, KSpread), PDF-megjelenítők, ..."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Játékgép"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Játékprogramok: lövöldözős, táblás, stratégiai, ..."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimédiás munkaállomás"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Lejátszó- és szerkesztőprogramok hang- és videóanyagokhoz"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internetes munkaállomás"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -421,193 +540,193 @@ msgid ""
 msgstr ""
 "Eszközök levelezéshez, hírkezeléshez (mutt, tin, ...) és a web böngészéséhez"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Hálózati számítógép (kliens)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Kliensprogramok különféle protokollokhoz (például: ssh)"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Segédprogramok a számítógép beállításához"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Parancssori eszközök"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Szövegszerkesztők, parancsértelmezők, fájlkezelők, terminálprogramok"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Fejlesztés"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C/C++ fejlesztőkönyvtárak, programok és include-fájlok"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentáció"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Könyvek és HOGYAN-ok a Linuxról és a szabad szoftverekről"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Külső társaságok alkalmazásainak támogatása."
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Webkiszolgáló"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Csoportmunka-alkalmazás"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Tűzfal/útválasztó (router)"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet átjáró"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Levelezés/hírek"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix email kiszolgáló, Inn hírkiszolgáló"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Címtárkiszolgáló"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "DNS és NIS kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fájl- és nyomtatómegosztási kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS kiszolgáló, Samba kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Adatbázis"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL és MySQL adatbázis kiszolgáló"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL és MariaDB adatbázis kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Levelezés"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix email kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL vagy MySQL adatbázis kiszolgáló"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL vagy MariaDB adatbázis kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Kiszolgáló hálózati számítógépekhez"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS, SMB, proxy és SSH kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafikus környezet"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE munkaállomás"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -616,12 +735,12 @@ msgstr ""
 "A K Desktop Environment - az alapvető grafikus környezet - az ahhoz tartozó "
 "eszközökkel együtt"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME munkaállomás"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -629,66 +748,125 @@ msgid ""
 msgstr ""
 "Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "XFCE munkaállomás"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Egy könnyedebb grafikus környezet felhasználóbarát alkalmazásokkal és "
+"asztali eszközökkel."
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "MATE munkaállomás"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Cinnamon munkaállomás"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Egy GNOME-on alapuló grafikus környezet"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "LXQT Munkaasztal"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+"A pehelysúlyú munkaasztal-környezet új generációs, QT-ra portolt változata"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Enlightenment e17 munkaasztal"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Egy könnyű, gyors grafikus környezet"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE munkaasztal"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Egy könnyű, gyors grafikus környezet"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasma Desktop"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Egy könnyű és gyors grafikus környezet felhasználóbarát alkalmazásokkal és "
-"segédprogramokkal"
+"A Plasma Desktop, az alap grafikus környezet néhány kiegészítő eszközzel."
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Más grafikus környezetek"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "WindowMaker, Enlightenment, Fvwm, ..."
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, stb."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Segédprogramok"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH kiszolgáló"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin kiszolgáló távoli beállításhoz"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Hálózati programok/hálózatfigyelés"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Figyelőeszközök, folyamatszámlázás, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia varázslók"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Varázslók a kiszolgáló beállítására"
@@ -702,7 +880,7 @@ msgstr ""
 "Hiba történt, de nem lett megfelelően lekezelve.\n"
 "Csak akkor lépjen tovább, ha biztos abban, hogy ez nem fog gondot okozni."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -723,266 +901,253 @@ msgstr "A következő lépés: \"%s\"\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux telepítés %s"
+msgid "%s Installation %s"
+msgstr "%s telepítés %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt+Tab> lépegetés"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Az Xorg kiszolgáló lassan indul. Kérem várjon..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "A rendszer gyenge erőforrásokkal rendelkezik. Előfordulhat, hogy problémái\n"
-"lesznek a Mageia Linux telepítésével. Ha így történik, próbálkozzon\n"
+"lesznek a %s telepítésével. Ha így történik, próbálkozzon\n"
 "szöveges módú telepítéssel: CD-ről való rendszerindítást követően nyomjon\n"
 "\"F1\"-et, majd írja be azt, hogy \"text\"."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "A Mageia KDE asztalának telepítése"
+msgid "Media Selection"
+msgstr "Adathordozó kiválasztása"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "A Mageia GNOME asztalának telepítése"
+msgid "Install %s KDE Desktop"
+msgstr "A %s KDE asztalának telepítése"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "A %s GNOME asztalának telepítése"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Egyéni telepítés"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE munkaasztal"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME munkaasztal"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Egyéni munkaasztal"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "�gy fog kinézni a '%s' munkaasztala."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Kattintson a képre, ha nagyobb méretben szeretné megtekinteni"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Csomagcsoportok kiválasztása"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Csomagok egyedi kiválasztása"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Összméret: %d / %d MB"
+msgid "Unselect All"
+msgstr "Kijelölések megszüntetése"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Hibás csomag"
+msgid "Total size: %d / %d MB"
+msgstr "Összméret: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Verzió: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Méret: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Fontosság: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Ez a csomag nem jelölhető ki illetve nem törölhető a kijelölése"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "\"%s\" hiánya miatt"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "\"%s\" igényei miatt"
 
-# Francois Pons:
-# This is a message saying that a package is removed (or unselected) because the
-# dependency resolution algorithm needed to remove (or unselect) it when it tried
-# to promote a provide (a package name or property) with a better version, but it
-# failed.
-# "promote": It is a term used to say promotion of a provides (promoting perl for
-# example, is trying to find the best package providing perl and select it).
-# "%s" stands for the property being promoted, generally a simple name.
-# This is not really a failure message but an informative message. It has nothing
-# to do with failure in the sense of the application unable to continue. Urpmi
-# continues by not selecting a package which was selected by a promotion (not
-# asked by the user directly but caused by a package which has been upgraded thus
-# breaking existing packages, the promotion concerns this).
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "a legalkalmasabb \"%s\" keresése"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "\"%s\" megtartása érdekében"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Nem választhatja ki ezt a csomagot, mert nincs elég hely a merevlemezen."
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "A telepítő a következő csomagokat fogja telepíteni:"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "A telepítő a következő csomagokat távolítja el:"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ez egy kötelező csomag, nem lehet megszüntetni a kijelölését"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Nem törölhető ennek a csomagnak a kijelölése, mert már telepítve van"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr ""
 "Nem törölheti ennek a csomagnak a kijelölését. Ez a csomag frissítendő."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Automatikusan kijelölt csomagok mutatása"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Telepítés"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Kijelölés betöltése/mentése"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "A csomagkiválasztás frissítése"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimális telepítés"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Szoftverkezelés"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Válassza ki a telepítendő csomagokat"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Telepítés"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Részletek nélkül"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Hátralevő idő:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(becslés...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d csomag"
 msgstr[1] "%d csomag"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Összefoglalás"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Beállítás"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "nincs beállítva"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Adathordozó kiválasztása"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -991,12 +1156,12 @@ msgstr ""
 "A rendszer a következő telepítési adathordozókat találta.\n"
 "Ha szeretné kihagyni valamelyiket, távolítsa el annak kijelölését."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Lehetősége van arra, hogy a CD-k tartalmát lemásolja a merevlemezre a "
@@ -1004,72 +1169,72 @@ msgstr ""
 "Ez esetben a telepítés a merevlemezről folytatódik, és annak végeztével a "
 "csomagok elérhetők maradnak."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Teljes CD-k másolása"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Hiba lépett fel"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Válasszon billentyűzetkiosztást"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Az elérhető billentyűzetek teljes listája:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Telepítés/frissítés"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Új telepítés vagy frissítés?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Telepítés"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Frissítés: %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Titkosítási kulcs ehhez: %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Telepítés megszakítva, a rendszer újraindul"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Új telepítés"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Előző telepítés frissítése (nem ajánlott)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1077,46 +1242,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"A Telepítő olyan előzőleg telepített Mageia Linux rendszert talált, \n"
-"melyet nem biztonságos frissíteni %s-re.\n"
+"A telepítő észlelte, hogy a már meglévő Linux rendszer\n"
+"nem frissíthető %s-ra.\n"
 "\n"
-"Ajánlott egy új telepítéssel lecserélni a régi rendszert.\n"
+"Javasolt új telepítést végezni a régi helyén.\n"
 "\n"
-"Figyelem: ha az \"Új telepítést\" választja, akkor ajánlott minden \n"
-"személyes adat előzetes lementése."
+"Figyelem: új telepítés előtt célszerű minden személyes dokumentumról\n"
+"mentést készíteni."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE beállítások"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Nincs elég szabad hely az 1 MB-os betöltőprogramnak. A telepítés "
-"folytatható, de a rendszer indításához létre kell hozni egy rendszerindító "
-"partíciót a DiskDrake-kel."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Létre kell hozni egy PPC PReP rendszerindítót. A telepítés folytatódik, de a "
-"rendszer indításához létre kell hozni a rendszerindítási partíciót a "
-"DiskDrake-kel."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1129,12 +1273,12 @@ msgstr ""
 "Ha nincs ilyen lemeze, akkor nyomja meg a \"Mégsem\" gombot, így erről a CD-"
 "ről nem történik telepítés."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "A rendelkezésre álló csomagok keresése..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1143,7 +1287,7 @@ msgstr ""
 "A rendszerben nincs elegendő szabad hely a telepítéshez illetve frissítéshez "
 "(%d MB > %d MB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1153,52 +1297,52 @@ msgstr ""
 "csomagkijelölést vagy a jelenlegi kijelölést szeretné elmenteni.\n"
 "A formátum ugyanaz, mint az automatikus telepítési fájloknál."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Terhelés"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Mentés"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Hibás fájl"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Munkaasztal kiválasztása"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Kiválaszthatja a munkaállomás asztalprofilját."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "A kijelölt összméret nagyobb, mint a rendelkezésre álló hely"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "A telepítés típusa"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1207,89 +1351,117 @@ msgstr ""
 "Egyetlen csomagcsoportot sem jelölt ki.\n"
 "Válassza ki, milyen fajta minimális telepítést szeretne."
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X telepítése"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Telepítésre javasolt csomagok"
+msgid "Install recommended packages"
+msgstr "Javasolt csomagok telepítése"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Alapvető dokumentációval (javasolt)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Valóban minimális telepítés (urpmi sincs)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Felkészülés a frissítésre..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "A telepítés előkészítése"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s csomag telepítése"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Hiba történt a csomagok rendezésekor:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Kívánja folytatni ettől függetlenül?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Újra"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Ezen csomag kihagyása"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "A(z) \"%s\" adathordozón levő összes csomag kihagyása"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Visszalépés az adathordozó és csomagválasztáshoz"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Hiba történt a(z) %s csomag telepítésekor."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Telepítés utáni beállítások"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Tegye be a frissítési modulokat tartalmazó adathordozót a(z) \"%s\" "
 "meghajtóba"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Frissítések"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Itt a lehetőség online csomagtárolók hozzáadására."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Ezzel lehetséges a biztonsági frissítések telepítése."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Ezen csomagtárolók beállításához működő Internet kapcsolat\n"
+"szükséges.\n"
+"\n"
+"Beállítsuk most a frissítési tárolót?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1308,28 +1480,29 @@ msgstr ""
 "\n"
 "Szeretné feltelepíteni a frissítéseket?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s ezen: %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardver"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Hangkártya"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Van ISA hangkártyája?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1338,82 +1511,70 @@ msgstr ""
 "A hangkártya beállításához futtassa az \"alsaconf\" vagy az \"sndconfig\" "
 "programot a telepítés után."
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "A telepítő nem talált hangkártyát. Futtassa a \"harddrake\" programot a "
 "telepítés után."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafikus felület"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Hálózat és internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxyk"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "beállítva"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Biztonsági szint"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Tűzfal"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktiválva"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "kikapcsolva"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Az X grafikus rendszert nem állította be. Biztosan megfelel így?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Rendszerbetöltő előkészítése..."
+msgid "Preparing initial startup program..."
+msgstr "A rendszerindító memóriaképfájl előkészítése..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Egy kis türelmét kérem..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"A gép típusa feltehetően OldWorld vagy ismeretlen, ezért a Yaboot "
-"rendszerindító program nem fog működni. A telepítés folytatódik, de a gép "
-"indításához BootX-re vagy egyéb módszerre lesz szükség. A gyökér-"
-"fájlrendszer kernelparamétere: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1422,17 +1583,17 @@ msgstr ""
 "Ezen a biztonsági szinten csak a rendszergazda érheti el a windowsos "
 "partíción levő fájlokat."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Tegyen egy üres floppyt a(z) \"%s\" meghajtóba"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Automatikus telepítőfloppy készítése..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1443,12 +1604,12 @@ msgstr ""
 "\n"
 "Biztos, hogy ki akar lépni?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulálunk"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Újraindítás"
@@ -1543,13 +1704,6 @@ msgid ""
 "Users"
 msgstr "Felhasználók"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Hálózat"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1591,116 +1745,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Kilépés"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Irodai programok: szövegszerkesztők (KWord, AbiWord), táblázatkezelők "
-#~ "(KSpread, Gnumeric), PDF-nézegetők, ..."
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "A rendszer %s kiadásra frissítését választotta. KDE 3.5 található a "
-#~ "jelenlegi rendszerén. \n"
-#~ "Ez a telepítő nem tudja a KDE 3.5-öt biztonságosan frissíteni. Ha "
-#~ "folytatja ezt a műveletet, \n"
-#~ "akkor a KDE 4 le fogja cserélni a KDE 3.5-öt, de minden személyes KDE "
-#~ "beállítása el fog veszni. \n"
-#~ "A KDE 3.5 frissítéséhez, illetve a személyes adatainak a megőrzéséhez \n"
-#~ "kérjük indítsa el a saját rendszerét, és használja a Mandriva frissítő "
-#~ "alkalmazását."
-
-#~ msgid "Proceed"
-#~ msgstr "Feldolgozva"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "hibával [%s] tért vissza"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "%s fájl letöltése..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr "32 bites disztribúcióról 64 bitesre való frissítés nem támogatott"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr "64 bites disztribúcióról 32 bitesre való frissítés nem támogatott"
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "A következő kiszolgálóprogramo(ka)t választotta ki: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Ezek alapértelmezésben aktiválva lesznek. Nem tartozik hozzájuk ismert\n"
-#~ "biztonsági probléma, de később ismertté válhatnak újak. Ha ez "
-#~ "bekövetkezik,\n"
-#~ "akkor frissítést kell végezni minél hamarabb.\n"
-#~ "\n"
-#~ "\n"
-#~ "Biztosan telepíteni szeretné a kiszolgálóprogramo(ka)t?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "IceWm-munkaasztal"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr ""
-#~ "Kapcsolatfelvétel a tükörkiszolgálóval; az elérhető csomagok listájának "
-#~ "letöltése..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Nem sikerült kapcsolódni ehhez a tükörkiszolgálóhoz: %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Automatikus telepítőfloppy készítése"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "Az automatikus telepítés akár teljesen automatikus is lehet,\n"
-#~ "ebben az esetben az egész merevlemez tartalmát módosíthatja.\n"
-#~ "Elsősorban akkor ajánlott, ha másik gépre is telepíteni kívánja\n"
-#~ "a rendszert.\n"
-#~ "\n"
-#~ "Lehetőség van a telepítés újrajátszására is.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Újrajátszás"
-
-#~ msgid "Automated"
-#~ msgstr "Automatikus"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Csomagösszeállítás mentése"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Szeretné az aboot-ot használni?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Hiba az aboot telepítésekor.\n"
-#~ "Próbáljam újra a telepítést akkor is, ha ez esetleg tönkreteszi az első\n"
-#~ "partíciót?"
diff --git a/perl-install/install/share/po/id.po b/perl-install/install/share/po/id.po
index 0568270db..c33aaba5d 100644
--- a/perl-install/install/share/po/id.po
+++ b/perl-install/install/share/po/id.po
@@ -1,64 +1,92 @@
-# Instalator Grafis Mandriva Linux
-# Copyright (C) 1999 Mandriva
-# Budi Rachmanto <rac@mandrivalinux.org>, 2001-2003
-# Linux Indonesia <http://www.linux.or.id>, 1999-2001
-# Mohammad DAMT <mdamt@cdl2000.com>, 1999-2001
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Ahmad Ramadhana <ahmad_ramadhana@yahoo.com.sg>, 2005
 # Andy <chandy@indo.net.id>, 1999
+# Bayu Artanto <bayuart@yahoo.com>, 2005
+# erwiensamantha <erwiensamantha@gmail.com>, 2005
+# erwiensamantha <erwiensamantha@gmail.com>, 2005
+# Firdaus <dausnux@gmail.com>, 2005
 # Kelana <nk@telkom.net>, 1999
-# Willy Sudiarto Raharjo <willysr@gmail.com>, 2004 - 2007.
-# Erwien Samantha <erwiensamantha@gmail.com>, 2005.
-# Bayu Artanto <bayuart@yahoo.com>, 2005.
-# Ahmad Ramadhana <ahmad_ramadhana@yahoo.com.sg>, 2005.
-# Firdaus <dausnux@gmail.com>, 2005.
-# Sofian <sofianhanafi@yahoo.com>, 2005.
-#
+# Kiki <kiki.syahadat@yahoo.co.id>, 2014-2015
+# Kiki <kiki.syahadat@yahoo.co.id>, 2013
+# Kiki Syahadat <kiki.syahadat@yahoo.co.id, 2012
+# Kiki <kiki.syahadat@yahoo.co.id>, 2013
+# Sofian <sofianhanafi@yahoo.com>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX 0.1\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2007-10-27 18:51+0700\n"
-"Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
-"Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 13:27+0000\n"
+"Last-Translator: Kiki <kiki.syahadat@yahoo.co.id>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
+"language/id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.6\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
+msgid "Join Us!"
+msgstr "Bergabunglah Bersama Kami!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr ""
+msgid "Make it yours!"
+msgstr "Buatlah ini milik Anda!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr ""
+msgid "Your choice!"
+msgstr "Pilihan Anda!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr ""
+msgid "Office tools"
+msgstr "Peralatan perkantoran"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr ""
+msgid "Home entertainment"
+msgstr "Hiburan rumah"
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Untuk anak-anak"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Untuk keluarga!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Untuk developer!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Terima kasih!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Bebaskan!"
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Apakah Anda memiliki media tambahan lagi?"
+msgstr "Apakah Anda memiliki media bantu lanjutan?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -66,121 +94,196 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
-"Media berikut ditemukan dan akan digunakan selama installasi: %s.\n"
+"Media berikut ditemukan dan akan digunakan selama instalasi: %s.\n"
 "\n"
 "\n"
-"Apakah Anda memiliki media installasi tambahan untuk dikonfigurasi?"
+"Apakah Anda memiliki media instalasi bantu untuk dikonfigurasi?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Jaringan (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Jaringan (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Jaringan (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL dari mirror?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL harus diawali dengan ftp:// atau http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "Menghubungi situs Mageia Linux untuk mengambil daftar mirror..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr ""
+"Menghubungi situs web %s untuk mendapatkan daftar mirror yang tersedia..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Gagal menghubungi situs Mageia Linux untuk mengambil daftar mirror yang "
-"tersedia"
+"Gagal menghubungi situs web %s untuk mendapatkan daftar mirror yang tersedia"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
-msgstr "Pilih mirror tempat Anda ingin mengambil paket"
+msgstr "Pilih mirror di mana Anda ingin mengambil paket"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
-msgstr "Setup NFS"
+msgstr "Pengaturan NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
-msgstr "Harap masukkan nama host dan direktori dari media NFS Anda"
+msgstr "Silakan masukkan hostname dan direktori media NFS Anda"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
-msgstr "Nama host tidak ada"
+msgstr "Hostname tidak ada"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Direktori harus dimulai dengan \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
-msgstr "Nama host dari mount NFS ?"
+msgstr "Hostname dari mount NFS ?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Direktori"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
-msgstr "Tambahan"
+msgstr "Media bantu"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
-"Tidak dapat menemukan file daftar paket pada mirror ini. Pastikan lokasinya "
+"Tidak bisa menemukan file daftar paket pada mirror ini. Pastikan lokasinya "
 "benar."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Rilis"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Rilis"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Rilis"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Beberapa hardware pada komputer Anda memerlukan beberapa firmwares non free "
+"agar driver free software bisa bekerja."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Anda harus menghidupkan \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" berisi beberapa bagian dari sistem dan aplikasinya"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" berisi software non free.\n"
+
+#: any.pm:477
+#, 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 ""
+"Juga berisi firmware yang diperlukan untuk device tertentu untuk beroperasi "
+"(misal: beberapa perangkat grafis ATI/AMD, beberapa perangkat jaringan, "
+"beberapa perangkat RAID, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" berisi software yang tidak bisa didistribusikan di setiap negara "
+"karena masalah paten software."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"Juga berisi software dari \"%s\" yang dibangun ulang dengan kemampuan "
+"tambahan."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+"Di sini Anda bisa menghidupkan lebih banyak media jika Anda menginginkannya"
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Media ini menyediakan update paket untuk media \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
-msgstr "Mencari paket yang sudah terinstall..."
+msgstr "Melihat paket yang sudah terinstall..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
-msgstr "Mencari paket untuk diupgrade..."
+msgstr "Menemukan paket untuk diupgrade..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
-msgstr "Menghapus paket-paket sebelum upgrade..."
+msgstr "Menghapus paket sebelum upgrade..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -188,92 +291,92 @@ msgid ""
 "\n"
 "Do you really want to remove these packages?\n"
 msgstr ""
-"Paket berikut akan dihapus agar sistem Anda dapat di-upgrade: %s\n"
+"Paket berikut akan dihapus untuk memungkinkan upgrade sistem Anda: %s\n"
 "\n"
 "\n"
-"Apakah Anda ingin menghapus paket tersebut?\n"
+"Apakah Anda benar-benar ingin menghapus paket ini?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
-msgstr "Kesalahan membaca file %s"
+msgstr "Error membaca file %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "Disk berikut telah diubah namanya:"
+msgstr "Disk berikut telah diubah nama:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (sebelumnya bernama %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
-msgstr "HFS"
+msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Jaringan"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
-msgstr "Silahkan pilih media"
+msgstr "Silakan pilih sebuah media"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "File sudah ada. Timpa file ini ?"
+msgstr "File sudah ada. Timpa file ini?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Izin ditolak"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
-msgstr "Nama NFS yang salah"
+msgstr "Nama NFS salah"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
-msgstr "Media rusak %s"
+msgstr "Media %s rusak"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
-msgstr "Tidak bisa membuat screenshot sebelum buat partisi"
+msgstr "Tidak bisa membuat screenshot sebelum mempartisi"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "Screenshot akan tersedia setelah installasi pada %s"
+msgstr "Screenshot akan tersedia setelah install di %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
-msgstr "Installasi"
+msgstr "Instalasi"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurasi"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Anda juga harus memformat %s"
@@ -284,35 +387,36 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"Beberapa perangkat keras pada komputer Anda memerlukan driver \n"
-"``proprietary'' agar bekerja. Anda bisa mencarinya pada : %s"
+"Beberapa hardware pada komputer Anda memerlukan driver ``proprietari'' untuk "
+"bekerja.\n"
+"Anda bisa menemukan informasinya di: %s"
 
 #: interactive.pm:22
 #, c-format
 msgid "Bringing up the network"
-msgstr "Mengaktifkan jaringan"
+msgstr "Menaikkan jaringan"
 
 #: interactive.pm:27
 #, c-format
 msgid "Bringing down the network"
-msgstr "Menonaktifkan jaringan"
+msgstr "Menurunkan jaringan"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
-msgstr ""
+msgstr "Silakan tunggu, mengambil file"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr ""
+msgstr "tidak bisa menambah media"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
-msgstr "Menyalin beberapa paket pada disk untuk kebutuhan di masa depan"
+msgstr "Menyalin beberapa paket pada disk untuk digunakan di kemudian hari"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Penyalinan sedang berjalan"
@@ -330,7 +434,7 @@ msgstr "penting"
 #: pkgs.pm:34
 #, c-format
 msgid "very nice"
-msgstr "amat bagus"
+msgstr "sangat bagus"
 
 #: pkgs.pm:35
 #, c-format
@@ -342,7 +446,23 @@ msgstr "bagus"
 msgid "maybe"
 msgstr "mungkin"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Mendapatkan informasi paket dari meta-data XML..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Tidak ada info xml untuk media \"%s\", hanya sebagian hasil untuk paket %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Tidak ada deskripsi"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -351,343 +471,412 @@ msgstr ""
 "Beberapa paket yang diminta oleh %s tidak bisa diinstall:\n"
 "%s"
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "Terjadi kesalahan"
+msgstr "Sebuah error terjadi:"
+
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Sebuah error fatal terjadi: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Jangan tanya lagi"
 
-#: pkgs.pm:814
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
-msgstr "transaksi installasi %d gagal"
+msgstr "Transaksi instalasi %d gagal"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "Menginstall paket %s"
+msgstr "Instalasi paket gagal:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Workstation"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
-msgstr "Workstation Kantor"
+msgstr "Workstation Perkantoran"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Program office: pengolah kata (OpenOffice.org Writer, Kword), spreadsheet "
-"(OpenOffice.org Calc, Kspread), viewer pdf, dll"
+"Program perkantoran: pengolah kata (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), pembaca PDF, dll"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Komputer Game"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Program hiburan: arcade, papan, strategi, dll"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Komputer Multimedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
-msgstr "Program untuk memainkan/mengedit suara dan video"
+msgstr "Program untuk memutar/mengedit suara dan video"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Komputer Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
-"Kumpulan aplikasi untuk membaca dan mengirimkan email dan berita (pine, "
-"mutt, tin..) dan untuk menjelajah Web"
+"Kumpulan peralatan untuk membaca dan mengirim surat dan berita (mutt, tin..) "
+"dan menjelajahi Web"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Komputer Jaringan (klien)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
-msgstr "Klien untuk berbagai protokol, termasuk ssh"
+msgstr "Klien untuk protokol yang berbeda termasuk ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
-msgstr "Aplikasi untuk mempermudah konfigurasi komputer Anda."
+msgstr "Peralatan untuk memudahkan konfigurasi komputer Anda"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
-msgstr "Aplikasi Konsol"
+msgstr "Peralatan Konsol"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
-msgstr "Editor, shell, aplikasi file, terminal"
+msgstr "Editor, shell, peralatan file, terminal"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Pengembangan"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
-msgstr "Pustaka, program, dan file include untuk pengembangan C dan C++"
+msgstr "Librari, program dan file yang disertakan untuk pengembangan C dan C++"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentasi"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Buku dan Howto untuk Linux dan Free Software"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Dukungan aplikasi pihak ketiga"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Server Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Server Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Gateway Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
-msgstr "Mail/Berita"
+msgstr "Surat/Berita"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Server mail Postfix, server berita Inn"
+msgstr "Server surat Postfix, server berita Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
-msgstr "Server Direktori"
+msgstr "Server direktori"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
-msgstr "Nama Domain dan Network Information Server"
+msgstr "Server Nama Domain dan Informasi Jaringan"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Server Sharing File dan Printer"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server NFS, server Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Basis Data"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Server Basis Data PostgreSQL dan MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Server Basis Data PostgreSQL dan MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
-msgstr "Mail"
+msgstr "Surat"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
-msgstr "Server mail Postfix"
+msgstr "Server surat Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server basis data PostgreSQL atau MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Server basis data PostgreSQL atau MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
-msgstr "Komputer Server Jaringan"
+msgstr "Server Komputer Jaringan"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "server NFS, SMB, Proxy, dan SSH"
+msgstr "Server NFS, server SMB, server Proxy, server ssh"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
-msgstr "Mode Grafis"
+msgstr "Lingkungan Grafis"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Workstation KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
-"K Desktop Environment, lingkungan grafis dasar dengan kumpulan aplikasi yang "
-"menyertainya"
+"K Desktop Environment, lingkungan grafis dasar dengan kumpulan peralatan "
+"yang menyertainya"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
-msgstr "Workstation Gnome"
+msgstr "Workstation GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
-"Lingkungan grafis dengan kumpulan aplikasi dan aplikasi desktop yang ramah "
-"pengguna"
+"Sebuah lingkungan grafis dengan kumpulan aplikasi dan peralatan desktop yang "
+"mudah digunakan"
+
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Lingkungan kerja XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Lingkungan grafis yang ringan dengan seperangkat aplikasi dan peralatan "
+"desktop yang mudah digunakan"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Lingkungan kerja MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Lingkungan kerja Cinnamon"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Lingkungan grafis berbasis GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Desktop LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Port QT generasi selanjutnya dari lingkungan desktop yang ringan"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Desktop Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Lingkungan grafis yang cepat dan ringan"
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "Desktop IceWm"
+msgstr "Desktop LXDE"
+
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Sebuah lingkungan grafis yang cepat dan ringan"
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Desktop Plasma"
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Lingkungan grafis dengan kumpulan aplikasi dan aplikasi desktop yang ramah "
-"pengguna"
+"Desktop Plasma, lingkungan grafis dasar dengan sekumpulan peralatan yang "
+"menyertainya"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
-msgstr "Desktop Grafis lainnya"
+msgstr "Desktop Grafis Lainnya"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, dsb"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, dsb"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilitas"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Server SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Server Konfigurasi Remote Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Utilitas Jaringan/Pengawasan"
+msgstr "Utilitas/Monitoring Jaringan"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
-msgstr "Aplikasi pengawasan, akuntasi proses, tcpdump, nmap, ..."
+msgstr "Peralatan monitoring, penghitungan proses, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Wizard Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Wizard untuk mengkonfigurasi server"
@@ -698,10 +887,10 @@ msgid ""
 "An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"Terjadi kesalahan, tetapi tidak diketahui cara mengatasinya dengan baik.\n"
-"Lanjutkan dengan resiko ditanggung sendiri."
+"Terjadi error yang tidak diketahui cara yang baik untuk menanganinya.\n"
+"Lanjutkan dengan resiko yang Anda tanggung sendiri."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -710,9 +899,9 @@ msgid ""
 "\"\n"
 msgstr ""
 "Beberapa paket penting tidak terinstall dengan benar.\n"
-"Mungkin drive cdrom atau cdromnya yang rusak.\n"
-"Periksa cdrom pada komputer yang sudah terinstal dengan\n"
-"perintah \"rpm -qpl media/main/*.rpm\"\n"
+"Mungkin drive cdrom atau cdrom Anda rusak.\n"
+"Periksa cdrom pada komputer yang sudah terinstall menggunakan \"rpm -qpl "
+"media/main/*.rpm\"\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
@@ -721,337 +910,340 @@ msgstr "Memasuki langkah `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Installasi Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Instalasi %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
-msgstr "<Tab>/<Alt-Tab> antar elemen"
+msgstr "<Tab>/<Alt-Tab> di antara elemen"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
-msgstr ""
+msgstr "Server Xorg lambat memulai. Silakan tunggu..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Sumber daya sistem Anda rendah. Anda akan mengalami kesulitan\n"
-"menginstall Mageia Linux. Jika terjadi, Anda bisa mencoba\n"
-"installasi berbasis teks. Untuk melakukannya, tekan `F1' saat\n"
-"booting pada CDROM, lalu ketikkan `text'."
+"Sistem Anda memiliki sumber daya yang rendah. Anda mungkin menemukan "
+"beberapa\n"
+"masalah instalasi %s. Jika ini terjadi, Anda bisa mencoba instalasi berbasis "
+"teks.\n"
+"Untuk melakukannya, tekan `F1' saat booting pada CDROM, lalu masukkan `text'."
+
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr "Pemilihan Media"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Install Desktop KDE Mageia"
+msgid "Install %s KDE Desktop"
+msgstr "Install Desktop KDE %s"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Install Desktop GNOME Mageia"
+msgid "Install %s GNOME Desktop"
+msgstr "Install Desktop GNOME %s"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
-msgstr "Installasi kustomisasi"
+msgstr "Instalasi kustomisasi"
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "Desktop IceWm"
+msgstr "Desktop KDE"
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "Desktop IceWm"
+msgstr "Desktop GNOME"
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "Desktop IceWm"
+msgstr "Desktop kustomisasi"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
-msgstr ""
+msgstr "Ini adalah pratampil desktop '%s'."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
-msgstr ""
+msgstr "Klik pada gambar untuk melihat pratampil lebih besar"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
-msgstr "Pilihan Grup Paket"
+msgstr "Pemilihan Grup Paket"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
-msgstr "Pilih paket individu"
+msgstr "Pemilihan paket individu"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Ukuran total: %d / %d MB"
+msgid "Unselect All"
+msgstr "Jangan pilih Semua"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Paket rusak"
+msgid "Total size: %d / %d MB"
+msgstr "Ukuran total: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versi: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Ukuran: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
-msgstr "Tingkat kepentingan: "
+msgstr "Penting:"
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Anda tidak bisa memilih/tidak memilih paket ini"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
-msgstr "karena %s hilang"
+msgstr "karena %s tidak ada"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "karena %s tidak terpenuhi"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "mencoba mempromosikan %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "untuk menjaga %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
-"Anda tidak bisa memilih paket ini karena tidak ada ruang kosong yang tersisa"
+"Anda tidak bisa memilih paket ini karena tidak ada lagi ruang tersisa untuk "
+"menginstall"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
-msgstr "Paket berikut akan diinstal"
+msgstr "Paket berikut akan diinstall"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Paket berikut akan dihapus"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
-msgstr "Ini merupakan paket wajib, tidak bisa dibuang"
+msgid "This is a mandatory package, it cannot be unselected"
+msgstr "Ini adalah paket wajib, tidak bisa tidak dipilih"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
-msgstr "Anda tidak bisa tidak memilih paket ini. Ia sudah terinstall"
+msgid "You cannot unselect this package. It is already installed"
+msgstr "Anda tidak bisa tidak memilih paket ini. Ini sudah terinstall"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
-msgstr "Anda tidak bisa tidak memilih paket. Paket harus diupgrade"
+msgid "You cannot unselect this package. It must be upgraded"
+msgstr "Anda tidak bisa tidak memilih paket ini. Ini harus diupgrade"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
-msgstr "Tunjukkan paket yang sudah dipilih secara otomatis"
+msgstr "Tunjukkan paket terpilih secara otomatis"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
-msgstr "Instal"
+msgstr "Install"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Pilihan Muat/Simpan"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Mengupdate pilihan paket"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
-msgstr "Installasi minimal"
+msgstr "Instalasi minimal"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
-msgstr "Manajemen Perangkat Lunak"
+msgstr "Manajemen Software"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
-msgstr "Pilih paket yang akan diinstal"
+msgstr "Pilih paket yang ingin Anda install"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Menginstall"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
-msgstr "Tanpa Detail"
+msgstr "Tidak ada rincian"
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "Sisa waktu"
+msgstr "Waktu tersisa:"
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "Memperkirakan"
+msgstr "(memperkirakan...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d paket"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Ringkasan"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
-msgstr "Konfigurasikan"
+msgstr "Konfigurasi"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
-msgstr "tidak dikonfigurasikan"
-
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Pilihan Grup Paket"
+msgstr "tidak terkonfigurasi"
 
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
-"Media installasi berikut ditemukan. Jika Anda ingin\n"
-"melewati beberapa, Anda bisa tidak memilihnya sekarang."
+"Media instalasi berikut telah ditemukan.\n"
+"Jika Anda ingin melewati beberapa, Anda bisa tidak memilihnya."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
-"Anda memiliki opsi untuk menyalin isi CD pada hard disk sebelum installasi. "
-"Proses akan dilanjutkan dari hard disk dan paket akantetap tersedia setelah "
-"sistem terinstall."
+"Anda memiliki opsi untuk menyalin isi dari CD ke hard disk sebelum "
+"instalasi.\n"
+"Proses kemudian akan dilanjutkan dari hard disk dan paket akan tetap "
+"tersedia setelah sistem terinstall."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Salin seluruh CD"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
-msgstr "Terjadi kesalahan"
+msgstr "Sebuah error terjadi"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
-msgstr "Pilih layout keyboard Anda"
+msgstr "Silakan pilih layout keyboard Anda"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "Berikut daftar keyboard yang tersedia"
+msgstr "Ini adalah daftar lengkap keyboard yang tersedia:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
-msgstr "Instal/Upgrade"
+msgstr "Install/Upgrade"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "Installasi atau upgrade?"
+msgstr "Apakah ini instalasi atau upgrade?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Install"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Upgrade %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Kunci enkripsi untuk %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
-msgstr ""
+msgstr "Batalkan instalasi, reboot sistem"
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "Installasi"
+msgstr "Instalasi Baru"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
-msgstr ""
+msgstr "Upgrade instalasi sebelumnya (tidak direkomendasikan)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1059,37 +1251,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
+"Installer telah mendeteksi bahwa Linux yang terinstall di sistem Anda\n"
+"tidak bisa diupgrade dengan aman ke %s.\n"
+"\n"
+"Instalasi baru untuk menggantikan sistem lama Anda direkomendasikan.\n"
+"\n"
+"Peringatan : Anda harus membackup semua data pribadi Anda sebelum memilih \n"
+"\"Instalasi Baru\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Mengkonfigurasi IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Tidak ada ruang 1MB untuk bootstrap! Installasi akan dilanjutkan, tetapi "
-"untuk boot sistem, Anda perlu membuat partisi bootstrap pada DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Anda harus membuat PPC PReP Boot bootstrap! Installasi akan dilanjutkan, "
-"tetapi untuk boot sistem, Anda perlu membuat partisi bootstrap pada DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1098,169 +1278,197 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "Ganti Cd-Rom Anda!\n"
-"\n"
-"Masukkan Cd-Rom berlabel \"%s\" pada drive dan tekan Ok. Jika Anda tidak \n"
-"punya, tekan Batal untuk menghindari installasi dari Cd-Rom ini."
+"Silakan masukkan Cd-Rom berlabel \"%s\" ke drive Anda dan tekan Ok "
+"setelahnya.\n"
+"Jika Anda tidak memilikinya, tekan Batal untuk menghindari instalasi dari Cd-"
+"Rom ini."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Mencari paket yang tersedia..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
-"Sistem Anda tidak memilih ruang kosong yang cukup untuk installasi atau "
-"upgrade (%dMB > %dMB)"
+"Sistem Anda tidak memiliki cukup ruang tersisa untuk instalasi atau upgrade "
+"(%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"Pilih muat atau simpan pilihan paket.\n"
-"Formatnya sama dengan file auto_install."
+"Silakan pilih muat atau simpan pemilihan paket.\n"
+"Formatnya sama dengan file yang dihasilkan auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
-msgstr "Beban"
+msgstr "Muat"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Simpan"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "File rusak"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "Pilihan Grup Paket"
+msgstr "Pemilihan Desktop"
 
-#: steps_interactive.pm:474
-#, fuzzy, c-format
+#: steps_interactive.pm:460
+#, c-format
 msgid "You can choose your workstation desktop profile."
-msgstr ""
-"Anda bisa memilih profil desktop workstation Anda: KDE, GNOME atau Kustom"
+msgstr "Anda bisa memilih profil desktop workstation Anda."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
-msgstr "Ukuran terpilih melebihi ruang yang ada"
+msgstr "Ukuran terpilih lebih besar dari ruang tersedia"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
-msgstr "Tipe installasi"
+msgstr "Tipe install"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
-"Anda belum memilih grup paket.\n"
-"Pilih installasi minimal yang Anda inginkan:"
+"Anda belum memilih grup paket apapun.\n"
+"Silakan pilih instalasi minimal yang Anda inginkan:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Dengan X"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Menginstall paket %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr "Install paket-paket yang disarankan"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
-msgstr "Dengan dokumentasi dasar (disarankan!)"
+msgstr "Dengan dokumentasi dasar (direkomendasikan!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
-msgstr "Installasi minimal sesungguhnya (khususnya tanpa urpmi)"
+msgstr "Benar-benar instalasi minimal (terutama tanpa urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Menyiapkan upgrade..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
-msgstr "Mempersiapkan installasi"
+msgstr "Menyiapkan instalasi"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Menginstall paket %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
-msgstr "Terdapat kesalahan pengurutan paket:"
+msgstr "Terdapat error mengurut paket:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
-msgstr "Lanjutkan?"
+msgstr "Lanjutkan saja?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
-msgstr "Ulang kembali"
+msgstr "Coba lagi"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
-msgstr "Lewati paket ini"
+msgstr "Lewatkan paket ini"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
-msgstr "Lewati semua paket-paket dari media \"%s\""
+msgstr "Lewatkan semua paket dari media \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
-msgstr "Kembali pada media dan pemilihan paket"
+msgstr "Kembali ke pemilihan media dan paket"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
-msgstr "Terdapat kesalahan penginstallan paket %s."
+msgstr "Terdapat error menginstall paket %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
-msgstr "Konfigurasi pasca installasi"
+msgstr "Konfigurasi pasca instalasi"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
-msgstr "Harap pastikan media Update Modul pada drive %s"
+msgstr "Silakan pastikan bahwa media Modul Update ada di drive %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Update"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Sekarang Anda memiliki kesempatan untuk mengatur media online."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Ini memungkinkan untuk menginstall update keamanan."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Untuk mengatur media tersebut, Anda harus memiliki koneksi\n"
+"internet yang bekerja.\n"
+"\n"
+"Apakah Anda ingin mengatur media update?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1272,138 +1480,127 @@ msgid ""
 "\n"
 "Do you want to install the updates?"
 msgstr ""
-"Anda kini memiliki kesempatan untuk mendownload paket update. Paket ini\n"
-"telah diupdate setelah distribusi dirilis. Paket mungkin berisi perbaikan\n"
-"keamanan atau kesalahan.\n"
+"Sekarang Anda memiliki kesempatan untuk mendownload paket update. Paket ini\n"
+"telah diupdate setelah distribusi dirilis. Paket ini mungkin\n"
+"berisi perbaikan keamanan atau bug.\n"
 "\n"
-"Untuk mendownload paket, Anda perlu koneksi Internet.\n"
+"Untuk mendownload paket ini, Anda memerlukan koneksi Internet.\n"
 "\n"
 "Apakah Anda ingin menginstall update?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s pada %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
-msgstr "Perangkat Keras"
+msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
-msgstr "Kartu suara"
+msgstr "Perangkat suara"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
-msgstr "Apakah Anda memiliki kartu suara ISA?"
+msgstr "Apakah Anda memiliki perangkat suara ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
-"Jalankan \"sndconfig\" atau \"sndconfig\" setelah installasi untuk "
-"mengkonfigurasi kartu suara Anda"
+"Jalankan \"alsaconf\" atau \"sndconfig\" setelah instalasi untuk "
+"mengkonfigurasi perangkat suara Anda"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
-"Tidak ada kartu suara yang terdeteksi. Coba \"harddrake\" setelah installasi"
+"Tidak ada perangkat suara terdeteksi. Coba \"harddrake\" setelah instalasi"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Antarmuka grafis"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Jaringan & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
-msgstr "Proxy "
+msgstr "Proxy"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "terkonfigurasi"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
-msgstr "Tingkat Keamanan"
+msgstr "Level Keamanan"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
-msgstr "telah diaktifkan"
+msgstr "diaktifkan"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
-msgstr "telah dinonaktifkan"
+msgstr "dimatikan"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
-msgstr "Anda belum mengkonfigurasi X. Apakah Anda yakin?"
+msgstr "Anda belum mengkonfigurasi X. Apakah Anda yakin menginginkan ini?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Mempersiapkan bootloader..."
+msgid "Preparing initial startup program..."
+msgstr "Menyiapkan program startup awal..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
-msgstr ""
-
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Nampaknya Anda memiliki komputer kuno/tidak dikenal, bootloader yaboot tidak "
-"akan bekerja. Installasi akan dilanjutkan, tetapi Anda harus menggunakan "
-"BootX atau cara lain untuk boot komputer Anda. Argumen kernel untuk fs root "
-"adalah: root=%s"
+msgstr "Harap bersabar, ini mungkin akan memakan waktu..."
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
-"Pada tingkat keamanan ini, akses pada file pada partisi Windows dibatasi "
-"hanya pada administrator."
+"Pada level keamanan ini, akses ke file di dalam partisi Windows terbatas "
+"pada administrator."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
-msgstr "Masukkan disket kosong pada drive %s"
+msgstr "Masukkan floppy kosong ke drive %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
-msgstr "Membuat disket installasi otomatis..."
+msgstr "Membuat instalasi otomatis floppy..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1414,15 +1611,15 @@ msgstr ""
 "\n"
 "Apakah Anda ingin keluar sekarang?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Selamat"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
-msgstr "Boot Ulang"
+msgstr "Reboot"
 
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
@@ -1456,14 +1653,14 @@ msgstr "Mouse"
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
-msgstr "Deteksi hard disk"
+msgstr "Pendeteksian hard drive"
 
 #: steps_list.pm:21 steps_list.pm:22
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Installation class"
-msgstr "Kelas installasi"
+msgstr "Kelas instalasi"
 
 #: steps_list.pm:23
 #, c-format
@@ -1484,7 +1681,7 @@ msgstr "Keamanan"
 msgid ""
 "_: Keep these entry short\n"
 "Partitioning"
-msgstr "Pembuatan partisi"
+msgstr "Mempartisi"
 
 #: steps_list.pm:27 steps_list.pm:28
 #, c-format
@@ -1498,7 +1695,7 @@ msgstr "Memformat"
 msgid ""
 "_: Keep these entry short\n"
 "Choosing packages"
-msgstr "Memilih paket-paket"
+msgstr "Memilih paket"
 
 #: steps_list.pm:31
 #, c-format
@@ -1514,13 +1711,6 @@ msgid ""
 "Users"
 msgstr "Pengguna"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Jaringan"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1562,198 +1752,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Keluar"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Program office: pengolah kata (kword, abiword), spreadsheet (kspread, "
-#~ "gnumeric), viewer pdf, dll"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Mendownload file %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr "Upgrade dari distribusi 32bit ke 64bit tidak didukung"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr "Upgrade dari distribusi 64bit ke 32bit tidak didukung"
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Anda telah memilih server berikut: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Server ini aktif secara default. Mereka tidak memiliki masalah keamanan,\n"
-#~ "tetapi bisa saja ditemukan. Pada kasus tersebut, Anda harus memastikan\n"
-#~ "untuk melakukan upgrade secepat mungkin.\n"
-#~ "\n"
-#~ "\n"
-#~ "Apakah Anda hendak menginstall server ini?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "Desktop IceWm"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "Menghubungi mirror untuk mendapatkan daftar paket yang tersedia..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Tidak dapat menghubungi mirror %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Membuat disket installasi otomatis"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "Installasi otomatis dapat dibuat otomatis penuh jika\n"
-#~ "diinginkan, pada kasus ini akan mengambil hard disk!!\n"
-#~ "(ini berarti untuk menginstall pada komputer lain).\n"
-#~ "\n"
-#~ "Anda mungkin memilih untuk mengulangi installasi.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Ulang"
-
-#~ msgid "Automated"
-#~ msgstr "Otomatis"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Simpan pilihan paket"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Apakah Anda ingin menggunakan aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Kesalahan menginstall aboot,\n"
-#~ "paksakan installasi meskipun merusak partisi pertama?"
-
-#~ msgid "All"
-#~ msgstr "Semua"
-
-#~ msgid "TV card"
-#~ msgstr "Kartu TV"
-
-#~ msgid "Boot"
-#~ msgstr "Boot"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Otentikasi"
-
-#~ msgid "Arkeia"
-#~ msgstr "Arkeia"
-
-#~ msgid "Flatout"
-#~ msgstr "Flatout"
-
-#~ msgid "Gwenview"
-#~ msgstr "Gwenview"
-
-#~ msgid "3D"
-#~ msgstr "3D"
-
-#~ msgid "CMS"
-#~ msgstr "CMS"
-
-#~ msgid "CRM"
-#~ msgstr "CRM"
-
-#~ msgid "2007 product line"
-#~ msgstr "Jajaran produk 2007"
-
-#~ msgid "Invictus Firewall"
-#~ msgstr "Firewall Invictus"
-
-#~ msgid "Discovery Live Mode"
-#~ msgstr "Mode Discovery Live"
-
-#~ msgid "How to register"
-#~ msgstr "Bagaimana mendaftarkan diri"
-
-#~ msgid "Rpmdrake 2"
-#~ msgstr "Rpmdrake 2"
-
-#~ msgid "Mandriva Online Services"
-#~ msgstr "Layanan Online Mandriva"
-
-#~ msgid "New Theme"
-#~ msgstr "Tema baru"
-
-#~ msgid "Web 2.0"
-#~ msgstr "Web 2.0"
-
-#~ msgid "Kaspersky"
-#~ msgstr "Kaspersky"
-
-#~ msgid "LinDVD"
-#~ msgstr "LinDVD"
-
-#~ msgid "Skype"
-#~ msgstr "Skype"
-
-#~ msgid "Transgaming/Cedega"
-#~ msgstr "Transgaming/Cedega"
-
-#~ msgid "DrakVPN"
-#~ msgstr "DrakVPN"
-
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "(%d paket, %d MB)"
-#~ msgstr[1] "(%d paket, %d MB)"
-
-#~ msgid "%d packages"
-#~ msgstr "%d paket"
-
-#~ msgid "Language"
-#~ msgstr "Bahasa"
-
-#~ msgid "License"
-#~ msgstr "Lisensi"
-
-#~ msgid "Installation class"
-#~ msgstr "Kelas installasi"
-
-#~ msgid "Formatting"
-#~ msgstr "Memformat"
-
-#~ msgid "Choosing packages"
-#~ msgstr "Memilih paket-paket"
-
-#~ msgid "Users"
-#~ msgstr "Pengguna"
-
-#~ msgid "Networking"
-#~ msgstr "Jaringan"
-
-#~ msgid "Configure X"
-#~ msgstr "Konfigurasi X"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "Tidak bisa mengakses modul kernel yang berhubungan dengan kernal Anda "
-#~ "(file %s hilang), ini biasanya berarti disket boot tidak sinkron dengan "
-#~ "media installasi (buatlah disket boot baru)"
diff --git a/perl-install/install/share/po/is.po b/perl-install/install/share/po/is.po
index 596c07401..bc7793637 100644
--- a/perl-install/install/share/po/is.po
+++ b/perl-install/install/share/po/is.po
@@ -1,58 +1,81 @@
-# Icelandic translation of DrakX.po
-# Translation file for Mandriva Linux graphic install, DrakX
-# Copyright (C) 1999,2003, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-#
-# Jóhann Þorvarðarson <johann.torvardarson@lais.is>, 1999-2000.
-# Þórarinn (Tony) R. Einarsson <thori@mindspring.com>, 1999-2000.
-# Pjetur G. Hjaltason <pjetur@pjetur.net>, 2003, 2005, 2006, 2007, 2008, 2009.
+# Translators:
+# Pjetur G. Hjaltason <pjetur@pjetur.net>, 2003,2005-2009
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-03-30 14:04+0000\n"
-"Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
-"Language-Team: Icelandic <kde-isl@molar.is>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-02-13 05:25+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/mageia/"
+"language/is/)\n"
 "Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);\n"
+
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Vinnustöðin þín á USB lykli"
+msgid "Your choice!"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Mageia uppsetningin með 100%% frjálsum, opnum hugbúnaði"
+msgid "Office tools"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Kannaðu Linux með Mageia One"
+msgid "Home entertainment"
+msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Full Mageia Linux vinnustöð, með þjónustu"
+msgid "For kids"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: dreifingar við allra hæfi"
+msgid "For family!"
+msgstr ""
 
-#: any.pm:109
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Hefur þú einhverja aðra aukamiðla?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -65,93 +88,88 @@ msgstr ""
 "\n"
 "Hefur þú einhverja aðra miðla sem þarf að stilla?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "Geisladrif"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Net (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Net (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Net (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Vefslóð að spegli?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Slóð verður að byrja á ftp:// eða http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Hef samband við Mageia Linux vefinn til að sækja lista yfir fáanlega "
-"spegla..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Hef samband við %s vefinn til að sækja lista yfir fáanlega spegla..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Mistókst að tengjast við Mageia Linux vefinn til að sækja lista yfir "
-"fáanlega spegla"
+"Mistókst að tengjast við %s vefinn til að sækja lista yfir fáanlega spegla"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Veldu spegilvélina þaðan sem á að sækja pakkanna"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS uppsetning"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Sláðu inn vélarnafn og möppu sem inniheldur NFS miðil"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Vélarnafn vantar"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Möppunafn verður að byrja á \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Vélarnafn á NFS tengipunkti?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Mappa"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Aukalegt"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -160,23 +178,90 @@ msgstr ""
 "Finn ekki pakkalista-skrá á þessum spegli. Athugaðu hvort staðsetningin sé "
 "rétt."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Athuga þegar uppsetta pakka..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Leita að pökkum til að uppfæra..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjarlægi pakka áður en uppfærsla hefst..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -189,87 +274,87 @@ msgstr ""
 "\n"
 "Viltu í alvöru fjarlægja þessa pakka?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Villa við lestur úr skránni %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Eftirfarandi diskar voru endurnefndir:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (áður nefnt %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Net"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Veldu miðil"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Skráin er þegar til. Skrifa yfir hana?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Aðgangi hafnað"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Rangt NFS nafn"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Gallaður miðill %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Get ekki tekið skjámyndir fyrr en disksneiðar hafa verið skilgreindar"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjámyndir verða tiltækar eftir uppsetningu í %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Set inn"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Stillingar"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Þú verður einnig að forsníða %s"
@@ -294,22 +379,22 @@ msgstr "Keyri upp netið"
 msgid "Bringing down the network"
 msgstr "Keyri niður netið"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Bíðið, sæki skrá"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr ""
+msgstr "get ekki bætt við miðli"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Afrita nokkra pakka á diska til notkunar síðar"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Afritun í gangi"
@@ -339,7 +424,24 @@ msgstr "þægilegt"
 msgid "maybe"
 msgstr "kannski"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Engin XML-info skrá fyrir miðil \"%s\", aðeins takmarkaðar upplýsingar fyrir "
+"pakka %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Engin lýsing til"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -348,66 +450,76 @@ msgstr ""
 "Suma pakka sem %s þarfnast, er ekki hægt að setja inn:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Villa kom upp:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Banvæn villa kom upp: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d Innsetningarfærslur brugðust"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Innsetning pakka tókst ekki:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Vinnustöð"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Skrifstofu-vinnustöð"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Skrifstofu forrit: ritvinnsla (OpenOffice.org Writer, Kword), töflureiknar "
-"(OpenOffice.org Calc, Kspread) pdf skoðarar, o.s.frv"
+"Skrifstofu forrit: ritvinnsla (LibreOffice Writer, Kword), töflureiknar "
+"(LibreOffice Calc, Kspread) pdf skoðarar, o.s.frv"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Leikja-(vinnu)stöð"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Leikjaforrit, skotleikir, borðleikir, herkænskuleikir og fleira"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Margmiðlunar-vinnustöð"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Spila og breyta hljóðskrám og kvikmyndum"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet-vinnustöð"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -416,270 +528,326 @@ msgstr ""
 "Tól og tæki til að lesa og senda póst, fréttir (mutt,tin...) og til að "
 "flakka á vefnum"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Netbiðlarar"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Biðlarar fyrir ýmsar samskiptareglur þ.m.t ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Tæki til að auðvelda uppsetningu tölvunnar"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Skjától"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Ritlar, skeljar, skráatól, skjáhermar"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Forritun"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C og C++ undirforritasöfn, forrit og lýsingaskrár"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Handbækur"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Bækur og leiðbeiningar um Linux og frjálsan hugbúnað"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Stuðningur fyrir forrit þriðja aðila"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Vefmiðlari"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Hópvinnuforrit"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Miðlari"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Eldveggur/beinir"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet netgátt"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Póstur/Fréttir"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix póstþjónusta, Inn fréttaþjónusta"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Upplýsingaveita"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Miðlari"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Nafnaþjónustur og net-upplýsingaveitur"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Skráa og prentmiðlari"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS miðlari, Samba miðlari"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Gagnagrunnar"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL og MySQL gagnagrunns-miðlarar"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL og MariaDB gagnagrunns-miðlarar"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Vefur/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Póstur"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix póstþjónusta"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL eða MySQL gagnagrunns-miðlarar"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL eða MariaDB gagnagrunns-miðlarar"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Netþjónustur"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-þjónusta, SMB-þjónusta, Staðgengils-þjónusta, ssh-þjónusta"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Myndrænt umhverfi"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE Vinnustöð"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE (K Desktop Environment). Gluggastjóri með safni hjálparforrita"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome vinnustöð"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Gluggastjóri með notendavænum forritum og skjáborðs-tólum"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE Skjáborð"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Létt og hratt gluggaumhverfi með notendavænum forritum og skjáborðs-tólum"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Aðrir gluggastjórar"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, o.s.frv"
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Tól"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Miðlari"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin, stillingar á fjartengdri tölvu um vef"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Netforrit/Neteftirlit"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Eftirlitstól, vinna með notendur, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia Ráðgjafar"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Ráðgjafar til að stilla miðlara"
@@ -693,7 +861,7 @@ msgstr ""
 "Óþekkt villa kom upp sem ekki er hægt að meðhöndla.\n"
 "Haltu áfram á eigin ábyrgð."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -713,252 +881,252 @@ msgstr "Byrja skref `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux uppsetning %s"
+msgid "%s Installation %s"
+msgstr "%s uppsetning %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> milli skrefa"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg miðlari er seinn að ræsa. Bíddu við..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Ef vélin þín er vanbúin að einhverju leyti þá getur þú átt\n"
-"í vandræðum með að setja upp Mageia Linux.\n"
+"í vandræðum með að setja upp %s.\n"
 "Ef svo er, þá gætir þú reynt að nota texta-uppsetningu.\n"
 "Til þess að gera það, ýttu á F1 þegar þú ræsir af\n"
 "geisladisknum og sláðu síðan inn `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Setja inn Mageia KDE umhverfi"
+msgid "Media Selection"
+msgstr "Val á miðlum"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Setja inn Mageia GNOME umhverfi"
+msgid "Install %s KDE Desktop"
+msgstr "Setja inn %s KDE umhverfi"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Setja inn %s GNOME umhverfi"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Sérsniðin uppsetning"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE Skjáborð"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME Skjáborð"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Sérsniðið Skjáborð"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Hér er forsýn af '%s' skjáborðinu."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Smelltu á myndir til að sjá stærri forsýn"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Val á pakkahóp"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Val á einstökum pökkum"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Heildarstærð: %d / %d MB"
+msgid "Unselect All"
+msgstr "Afvelja allt"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Skemmdur pakki"
+msgid "Total size: %d / %d MB"
+msgstr "Heildarstærð: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Útgáfa: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Stærð: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Mikilvægi: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Þú getur ekki valið/af-valið þennan pakka"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "vegna þess að %s vantar"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "vegna þess að %s er ekki uppfyllt"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "reyni að hækka vægi %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "til þess að halda %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Þú getur ekki valið þennan pakka því það er ekki nægilegt pláss"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Eftirfarandi pakkar verða settir inn"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Eftirfarandi pakkar verða fjarlægðir"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Þessi pakki verður að vera uppsettur, þú getur ekki af-valið hann"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Þú getur ekki af-valið þennan pakka hann er þegar uppsettur"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Þú getur ekki af-valið þennan pakka, það verður að uppfæra hann"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Sýna sjálfvirkt valda pakka"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Setja inn"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Sækja/Vista val"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Uppfæri val á pökkum"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Lágmarks uppsetning"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Hugbúnaðarumsýsla"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Veldu pakkana sem þú vilt setja inn"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Set inn"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Engar upplýsingar"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Tími eftir:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(áætla...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakki"
 msgstr[1] "%d pakkar"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Yfirlit"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Stilla"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "ekki stillt"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Val á miðlum"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -967,12 +1135,12 @@ msgstr ""
 "Eftirfarandi uppsetningar-miðlar hafa fundist.\n"
 "Ef þú vilt sleppa einhverjum af þeim, þá getur þú af-valið þá núna."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Þú getur valið að afrita innihald geisladiskanna inn á diskinn fyrir "
@@ -980,72 +1148,72 @@ msgstr ""
 "Síðan mun uppsetning halda áfram frá disknum og pakkarnir verða til staðar "
 "þegar kerfið er að fullu uppsett."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Afrita alla geisladiska"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Villa kom upp"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Veldu lyklaborðs-uppsetningu"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Hér er tæmandi listi af tiltækum lyklaborðum:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Innsetning/Uppfærsla"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Er þetta innsetning eða uppfærsla?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Innsetning"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Uppfæra %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Dulritunar-lykill fyrir %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Hætta við innsetningu, endurræsa kerfi"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Ný Uppsetning"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Uppfæra fyrri uppsetningu (ekki mælt með)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1053,44 +1221,18 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Uppsetningarforritið hefur ályktað að ekki sé hægt með öryggi að uppfæra "
-"Mageia Linux kerfið þitt í %s.\n"
-"\n"
-"Mælt er með að setja inn nýja uppsetningu sem kemur í stað þeirrar fyrri.\n"
-"\n"
-"Aðvörun : þú ættir að afrita öll persónuleg gögn áður en þú velur \"Ný "
-"Uppsetning\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Uppsetning IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Ekki pláss fyrir 1MB ræsigeira! Uppsetning mun halda áfram, en til að ræsa "
-"kerfið þitt verður þú að búa til ræsi-disksneið með DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Þú þarft að búa til PPC PReP for-ræsingu! Uppsetningin mun halda áfram, en "
-"til að ræsa kerfið, þarft þú að búa til ræsi-disksneið með DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1104,12 +1246,12 @@ msgstr ""
 "Ef þú hefur ekki diskinn, ýttu þá að \"Hætta við\" til að sleppa uppsetningu "
 "frá þessum diski."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Leita að tiltækum pökkum..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1118,7 +1260,7 @@ msgstr ""
 "Það er ekki nóg laust pláss fyrir innsetningu eða uppfærslu á kerfinu þínu "
 "(%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1127,52 +1269,52 @@ msgstr ""
 "Veldu hvort eigi að sækja eða vista pakkaval.\n"
 "Sniðið er það sama og á auto_install skrám."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Sækja"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Vista"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Gölluð skrá"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Val á Skjáborði"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Þú getur valið vinnustöðvar-umhverfi (skjáborð)."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valin stærð er stærri en tiltækt pláss"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tegund uppsetningar"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1181,87 +1323,111 @@ msgstr ""
 "Þú hefur ekki valið neina pakkahópa.\n"
 "Veldu lágmarksuppsetningu sem þú vilt:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Með X"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Set inn pakka %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Með grunn-handbókum (mælt með!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Alger lágmarksuppsetning (ekkert urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Undirbý innsetningu"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Set inn pakka %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Það kom upp villa við að raða pökkum:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Viltu samt halda áfram?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Reyna aftur"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Sleppa þessum pakka"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Sleppa ölum pökkum af miðli \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Fara til baka í val á miðlum og pökkum"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Það kom upp villa við innsetningu pakka %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Lokastillingar"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Staðfestu að Uppfærslu-miðill sé í drifi %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Uppfærslur"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1281,28 +1447,29 @@ msgstr ""
 "\n"
 "Viltu sækja uppfærslurnar?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s á %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Vélbúnaður"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Hljóðkort"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Er kannski ISA hljóðkort í vélinni?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1311,81 +1478,69 @@ msgstr ""
 "Keyrðu \"alsaconf\" eða \"sndconfig\" eftir uppsetningu til að stilla "
 "hljóðkortið þitt"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Ekkert hljóðkort fannst. Reyndu að keyra \"harddrake\" eftir uppsetningu"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Myndrænt viðmót"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Staðarnet og Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Sel"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "stillt"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Öryggisþrep"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Eldveggur"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "virkt"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "óvirkt"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Þú hefur ekki sett upp X, ertu viss um að þú viljir þetta?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Set upp ræsistjórann..."
+msgid "Preparing initial startup program..."
+msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Verið þolinmóð þetta getur tekið nokkra stund..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Það lítur út fyrir að þú sért að nota OldWorld eða óþekkta vél, yaboot "
-"ræsiforritið mun ekki virka fyrir þig. Uppsetning mun halda áfram en þú "
-"verður að nota BootX eða aðrar leiðir til að ræsa vélina. kjarna-viðfangið "
-"fyrir rótarsneiðina er: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1394,17 +1549,17 @@ msgstr ""
 "� þessu öryggisþrepi er aðgangur að Windows disksneiðum takmarkaður við "
 "kerfisstjóra."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Settu tóman diskling í drif %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Bý til diskling fyrir sjálfvirka uppsetningu..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1415,12 +1570,12 @@ msgstr ""
 "\n"
 "Viltu virkilega hætta núna?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Til hamingju"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Endurræsa"
@@ -1515,13 +1670,6 @@ msgid ""
 "Users"
 msgstr "Notendur"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Net"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1564,40 +1712,5 @@ msgid ""
 "Exit"
 msgstr "Hætta"
 
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Skrifstofu forrit: ritvinnsla (kword, abiword), töflureiknar (kspread, "
-#~ "gnumeric) pdf skoðarar, o.s.frv"
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Þú hefur ákveðið að uppfæra kerfið þitt í %s. KDE 3.5 hefur fundist á\n"
-#~ "kerfinu þínu. Þetta uppsetningarforrit getur ekki varðveitt KDE 3.5 "
-#~ "uppsetningu.\n"
-#~ "Ef þú velur að halda áfram, þá verður KDE 4 sett upp í stað KDE 3 og "
-#~ "persónulegar\n"
-#~ "stillingar tapast.\n"
-#~ "Til að uppfæra með KDE 3.5, og varðveita persónulegar stillingar, "
-#~ "endurræstu\n"
-#~ "þá tölvuna þína og notaðu Mandriva bakka-uppfærsluforritið."
-
-#~ msgid "Proceed"
-#~ msgstr "Halda áfram"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Sæki skrá %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr "Ekki er stutt við uppfærslu frá 32-bita í 64-bita dreifingu"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr "Ekki er stutt við uppfærslu frá 64-bita í 32-bita dreifingu"
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Set upp ræsistjórann..."
diff --git a/perl-install/install/share/po/it.po b/perl-install/install/share/po/it.po
index 598a978c5..e4198a3c3 100644
--- a/perl-install/install/share/po/it.po
+++ b/perl-install/install/share/po/it.po
@@ -1,61 +1,82 @@
-# translation of DrakX.po to Italian
-# Copyright (C) 2000, 2001 Mandriva S.A.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Paolo Lorenzin <pasusu@tin.it>, 2000.
-# Simone Riccio <s.riccio@aeb-informatica.it>, 2002.
-# Roberto Rosselli Del Turco <rosselli@ling.unipi.it>, 2001, 2002,2003.
-# Marco De Vitis <mdv@spin.it>, 2003.
-# Andrea Celli <andrea.celli@libero.it>, 2003, 2004, 2005, 2006, 2007, 2008, 2009.
-# Giuseppe Levi <giuseppe.levi@email.it>, 2005.
-# Federica De Luca <my_utopia2002@hotmail.com>, 2008.
-# Moreno Manzini <moreno.mg@gmail.com>, 2009.
+# Translators:
+# killer1987 <marcello.anni@alice.it>, 2013-2014
+# Matteo Pasotti <matteo@xquiet.eu>, 2012-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-10-08 09:48+0200\n"
-"Last-Translator: Moreno Manzini <moreno.mg@gmail.com>\n"
-"Language-Team: Italian <timl@freelist.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-26 19:12+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/mageia/language/"
+"it/)\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Il vostro desktop su di una chiave USB"
+msgid "Join Us!"
+msgstr "Unisciti a noi!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Distribuzione Mageia Linux open source al 100%%"
+msgid "Make it yours!"
+msgstr "Rendila tua!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Esplora in modo semplicissimo Linux con Mageia One"
+msgid "Your choice!"
+msgstr "La tua scelta!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Desktop Mageia Linux completo, con supporto"
+msgid "Office tools"
+msgstr "Strumenti per l'ufficio"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: Distribuzioni per ogni necessità"
+msgid "Home entertainment"
+msgstr "Home entertainment"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Per i bambini"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Per la famiglia!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Per gli sviluppatori!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Grazie!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Sentiti libero!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Hai delle altre fonti d'installazione?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -69,94 +90,91 @@ msgstr ""
 "\n"
 "Disponi di altre fonti di installazione da configurare?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Rete (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Rete (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Rete (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL del mirror?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "L'URL deve iniziare con ftp:// o http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Connessione al sito Mageia Linux per ricevere l'elenco dei mirror "
-"disponibili..."
+"Contattando il sito web %s per ottenere l'elenco dei mirror disponibili..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Impossibile connettersi al sito Mageia Linux per ricevere l'elenco dei "
-"mirror disponibili"
+"È fallito il contatto col sito web %s per ottenere la lista dei mirror "
+"disponibili"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Scegli un mirror da cui recuperare i pacchetti"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Configurazione NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 "Immetti il nome dell'host e della directory che userai come supporto NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Manca il nome dell'host"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Una directory deve iniziare con \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Nome dell'host da montare con NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Directory"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Aggiuntivo"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -165,23 +183,99 @@ msgstr ""
 "Impossibile trovare su questo mirror il file con l'elenco dei pacchetti. "
 "Assicurati che l'indirizzo sia esatto."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Alcuni dispositivi hardware sul tuo elaboratore necessitano di firmware "
+"proprietari affinché il software libero dei driver possa funzionare."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Dovresti abilitare \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" contiene varie parti del sistema  e delle sue applicazioni"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" contiene software non libero.\n"
+
+#: any.pm:477
+#, 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 ""
+"Contiene inoltre firmware necessari al funzionamento di certi dispositivi  "
+"(eg: qualche scheda grafica ATI/AMD, qualche scheda di rete, qualche scheda "
+"RAID, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" contiene software che non può essere distribuito in qualsiasi paese a "
+"causa di brevetti software."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"Contiene inoltre software da \"%s\" ricostruito con funzionalità aggiuntive."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Qui puoi abilitare più fonti se lo desideri."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+"Questa fonte fornisce aggiornamenti dei pacchetti provenienti da \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ricerca dei pacchetti già installati..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Ricerca dei pacchetti da aggiornare..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Rimozione dei pacchetti prima di aggiornare..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -195,87 +289,87 @@ msgstr ""
 "\n"
 "Vuoi davvero rimuoverli?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Errore nel leggere il file %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Questi dischi hanno cambiato nome:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (che prima si chiamava %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rete"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Scegli una fonte"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Il file esiste già. Lo sovrascrivo?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nome NFS non valido"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Fonte non valida %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
-msgstr "Impossibile fare degli screenshot prima del partizionamento"
+msgstr "Non è possibile fare schermate prima di partizionamento"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Gli screenshot saranno disponibili in %s dopo l'installazione."
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Installazione"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "È necessario formattare anche %s"
@@ -299,22 +393,22 @@ msgstr "Attivazione della rete..."
 msgid "Bringing down the network"
 msgstr "Disattivazione della rete..."
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Attendi, recupero file in corso"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "impossibile aggiungere la fonte"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Copia di alcuni pacchetti sui dischi per un'utilizzazione futura"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Copia in corso"
@@ -344,7 +438,24 @@ msgstr "utile"
 msgid "maybe"
 msgstr "forse"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Ottengo le informazioni del pacchetto dai meta-dati XML..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Mancano informazioni XML per la fonte \"%s\", solo risultati parziali per il "
+"pacchetto %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Nessuna descrizione"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -353,66 +464,76 @@ msgstr ""
 "Alcuni pacchetti richiesti da %s non possono essere installati:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Si è verificato un errore:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Si è verificato un errore fatale: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Non chiedere più"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transazioni dell'installazione fallite"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installazione dei pacchetti non riuscita:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Postazione di lavoro"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Postazione per lavoro da ufficio"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programmi da ufficio: editor di testo (OpenOffice.org Writer, Kword), fogli "
-"elettronici (OpenOffice.org Calc, Kspread), visualizzatori PDF, ecc."
+"Programmi da ufficio: editor di testo (LibreOffice Writer, Kword), fogli "
+"elettronici (LibreOffice Calc, Kspread), visualizzatori PDF, ecc."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Computer per giocare"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programmi di svago: arcade, da tavolo, di strategia, ecc."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Postazione multimediale"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programmi di riproduzione/modifica audio e video"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Postazione Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -421,193 +542,193 @@ msgstr ""
 "Gruppo di programmi per leggere, inviare posta e news (mutt, tin...) e per "
 "navigare il Web"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Computer in rete (client)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Client per vari protocolli, incluso ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Strumenti per semplificare la configurazione del computer"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Programmi da riga di comando"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editor, shell, gestione file, terminali"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Sviluppo"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Librerie di sviluppo, programmi e file \"include\" per C e C++"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Libri e Howto su Linux e sul Software Libero"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Supporto per applicazioni di terze parti"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Server web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Server Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Gateway per Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Mail/News"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Server di posta Postfix, server di news Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Server di Directory"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Server per Domain Name e Network Information"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Server per la condivisione di file e stampanti"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server NFS, server Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Server di database PostgreSQL e MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Server di database PostgreSQL e MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache e Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Posta"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Server di posta Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server di database PostgreSQL o MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Server di database PostgreSQL o MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Server di rete"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Server NFS, server SMB, server proxy, server SSH"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambiente grafico"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Postazione di lavoro grafica con KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -616,12 +737,12 @@ msgstr ""
 "Il K Desktop Environment, l'ambiente grafico di base integrato da una ricca "
 "collezione di strumenti"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Postazione di lavoro grafica con GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -630,66 +751,125 @@ msgstr ""
 "Un ambiente grafico con un gruppo di applicazioni e di strumenti per il "
 "desktop di facile utilizzo"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Stazione di lavoro XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Un ambiente grafico più leggero con un set di applicazioni e strumenti per "
+"il desktop pensati per l'utente"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Stazione di lavoro MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Stazione di lavoro Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Un ambiente grafico basato su GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Desktop LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Un port QT di nuova generazione dell'ambiente desktop lightweight"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Desktop Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Un ambiente grafico leggero e veloce con un supporto dedicato"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Desktop LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Un ambiente grafico veloce e leggero"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Desktop Plasma"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Un ambiente grafico leggero e veloce con un gruppo di applicazioni e di "
-"strumenti per il desktop di facile utilizzo"
+"Il desktop Plasma, l'ambiente grafico di base con una collezione di "
+"strumenti che lo accompagnano"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Altri desktop grafici"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, ecc."
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilità"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Server SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Server Webmin per la configurazione remota"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Utilità/Monitoraggio della rete"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Strumenti di monitoraggio, accounting dei processi, tcpdump, nmap,..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
-msgstr "Procedure guidate Mageia"
+msgstr "Assistenti Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Procedure guidate per la configurazione del server"
@@ -703,7 +883,7 @@ msgstr ""
 "Si è verificato un errore non gestibile automaticamente.\n"
 "Puoi continuare a tuo rischio e pericolo."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -723,252 +903,253 @@ msgstr "Avvio della fase \"%s\"\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Installazione di Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "%s Installazione %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> muove il cursore"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Il server Xorg è lento ad avviarsi. Attendi..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Il sistema ha risorse scarse. Potrebbero verificarsi problemi installando\n"
-"Mageia Linux. In tal caso, puoi tentare un'installazione testuale. \n"
-"Per farlo, premi \"F1\" all'avvio da CDROM e poi digita \"text\"."
+"Il tuo sistema ha risorse non sufficienti. Potresti avere dei\n"
+"problemi nell'installazione di %s. Se ciò si verifica, puoi\n"
+"provare un'installazione testuale. Per questo, premi `F1' \n"
+"quando si avvia il CD-ROM, quindi digita `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Installa il desktop KDE per Mageia"
+msgid "Media Selection"
+msgstr "Selezione delle fonti d'installazione"
+
+#: steps_gtk.pm:253
+#, c-format
+msgid "Install %s KDE Desktop"
+msgstr "Installa il desktop KDE %s"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Installa il desktop GNOME per Mageia"
+msgid "Install %s GNOME Desktop"
+msgstr "Installa il desktop GNOME %s"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Installazione personalizzata"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Desktop KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Desktop GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Desktop personalizzato"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Ecco l'anteprima del desktop '%s'."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Clicca sulle immagini per ottenere un'anteprima più grande"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Selezione per gruppi di pacchetti"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Selezione individuale dei pacchetti"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Dimensione totale: %d / %d MB"
+msgid "Unselect All"
+msgstr "Deseleziona tutti"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Pacchetto non valido"
+msgid "Total size: %d / %d MB"
+msgstr "Dimensione totale: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versione: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Dimensione:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Importanza: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Non puoi selezionare/deselezionare questo pacchetto"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "per la mancanza di %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "perché %s non è soddisfatto"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "Ricerca del miglior pacchetto per %s..."
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "per conservare %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
-"Non puoi selezionare questo pacchetto. Non c'è spazio sufficiente per "
+"Non puoi selezionare questo pacchetto perché non c'è spazio sufficiente per "
 "installarlo"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "I seguenti pacchetti stanno per essere installati"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "I seguenti pacchetti stanno per essere rimossi"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
-msgstr "Questo è un pacchetto indispensabile, non può essere deselezionato"
+msgid "This is a mandatory package, it cannot be unselected"
+msgstr "Questo è un pacchetto obbligatorio, non puoi deselezionarlo"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Non puoi deselezionare questo pacchetto. È già installato"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Non puoi deselezionare questo pacchetto. Deve essere aggiornato"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Mostra i pacchetti selezionati automaticamente"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Installa"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Carica/salva selezione"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Aggiornamento scelta pacchetti"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Installazione minimale"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Gestione software"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Scegli i pacchetti che vuoi installare"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installazione"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Senza dettagli"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Tempo restante:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(stima in corso...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pacchetto"
 msgstr[1] "%d pacchetti"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Riepilogo"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configura"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "non configurata"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Selezione delle fonti d'installazione"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -977,84 +1158,85 @@ msgstr ""
 "Sono state trovate queste fonti d'installazione.\n"
 "Se vuoi ignorarne qualcuna, la puoi deselezionare ora."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
-"Prima dell'installazione, puoi copiare il contenuto dei CD sul disco fisso\n"
-"L'installazione continuerà dal disco fisso e i pacchetti resteranno "
-"disponibili anche quando il sistema sarà installato."
+"Hai la possibilità di copiare il contenuto dei CD sul disco rigido prima "
+"dell'installazione.\n"
+"Si proseguirà così dal disco rigido e i pacchetti rimarranno disponibili una "
+"volta che il sistema è completamente installato."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copia tutti i CD"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Si è verificato un errore"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Scegli la mappa della tastiera"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Ecco la lista completa delle tastiere disponibili:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installazione/Aggiornamento"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "È un'installazione o un aggiornamento?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installazione"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Aggiornamento di %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Chiave di cifratura per %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Cancella l'installazione, riavvia il sistema"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Nuova Installazione"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Aggiorna l'installazione precedente (Non raccomandato)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1062,45 +1244,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"L'installer ha riscontrato che il tuo sistema Mageia Linux non può\n"
-" essere aggiornato in modo sicuro a %s.\n"
+"L'installer ha rilevato che il sistema Linux installato non può essere "
+"aggiornato a %s in sicurezza.\n"
 "\n"
-"Si raccomanda una nuova installazione che sostituisca la precedente. \n"
+"Raccomandiamo una nuova installazione che sostituisca quella precedente.\n"
 "\n"
-"Attenzione : è consigliato un backup di tutti i dati personali \n"
-"prima di scegliere \"Nuova Installazione\"."
+"Attenzione: devi fare una copia di tutti i tuoi dati personali prima di "
+"scegliere \"Nuova installazione\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Sto configurando IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Non c'è spazio libero per un bootstrap di 1MB! L'installazione continua, ma "
-"per avviare il sistema dovrai creare la partizione di bootstrap con DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Devi creare una partizione di avvio \"PPC PReP\"! L'installazione continua, "
-"ma non potrai avviare il sistema, se prima non avrai creato la partizione di "
-"avvio con DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1113,12 +1275,12 @@ msgstr ""
 "pronto.\n"
 "Se non lo hai, premi Annulla per saltare l'installazione da quel Cd-Rom."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Ricerca dei pacchetti disponibili..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1127,7 +1289,7 @@ msgstr ""
 "Sul sistema non è rimasto sufficiente spazio libero per l'installazione o "
 "l'aggiornamento (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1136,53 +1298,53 @@ msgstr ""
 "Scegli se caricare o salvare la selezione di pacchetti.\n"
 "Il formato è lo stesso dei file generati con auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Carica"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Salva"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "File non valido"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Selezione Desktop"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 "Puoi scegliere il profilo della tua postazione di lavoro per il desktop"
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Lo spazio richiesto è maggiore di quello disponibile"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipo di installazione"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1191,88 +1353,112 @@ msgstr ""
 "Nessun gruppo di pacchetti risulta selezionato .\n"
 "Scegli il tipo di installazione minima desiderato:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Con X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Installazione dei pacchetti suggeriti"
+msgid "Install recommended packages"
+msgstr "Installa i pacchetti consigliati"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Con la documentazione essenziale (raccomandata!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Installazione veramente minimale (in particolare niente urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Preparazione del aggiornamento..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Sto preparando l'installazione"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Installazione del pacchetto %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "C'è un errore nell'ordinamento dei pacchetti:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Vado avanti comunque?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Riprova"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Salta questo pacchetto"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Salta tutti i pacchetti provenienti da \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Torna alla scelta dei pacchetti e delle fonti"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "C'è stato un errore nell'installazione del pacchetto %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configurazione post installazione"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Assicurati che gli \"Update Modules\" siano leggibili dal dispositivo %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Aggiornamenti"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1293,28 +1479,29 @@ msgstr ""
 "\n"
 "Vuoi installare gli aggiornamenti?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s in %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Scheda audio"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Hai una scheda audio ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1323,81 +1510,69 @@ msgstr ""
 "Lancia \"alsaconf\" o \"sndconfig\" dopo l'installazione per configurare la "
 "scheda audio"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Nessuna scheda audio rilevata. Prova con \"harddrake\" dopo l'installazione."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfaccia grafica"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Rete e Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxy"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "configurato"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Livello di sicurezza"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "attivato"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "disabilitato"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Non hai configurato X. Sei sicuro di non volerlo fare?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Preparazione del bootloader..."
+msgid "Preparing initial startup program..."
+msgstr "Sto preparando l'installazione..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Sii paziente, potrebbe servire un po' di tempo..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Apparentemente disponi di una macchina OldWorld o sconosciuta, il bootloader "
-"yaboot non andrà bene per te.L'installazione continuerà, ma dovrai usare "
-"BootX o qualche altro metodo per avviare il tuo computer. L'argomento da "
-"passare al kernel per il fs radice è: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1406,17 +1581,17 @@ msgstr ""
 "A questo livello di sicurezza, l'accesso ai file delle partizioni Windows è "
 "riservato all'amministratore."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Inserisci un floppy vuoto nell'unità %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Sto creando il floppy di installazione automatica..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1427,12 +1602,12 @@ msgstr ""
 "\n"
 "Vuoi veramente interrompere adesso?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Congratulazioni"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Riavvia"
@@ -1527,13 +1702,6 @@ msgid ""
 "Users"
 msgstr "Utenti"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Rete"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1575,10 +1743,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Esci"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programmi da ufficio: editor di testo (kword, abiword), fogli elettronici "
-#~ "(kspread, gnumeric), visualizzatori pdf, ecc."
diff --git a/perl-install/install/share/po/ja.po b/perl-install/install/share/po/ja.po
index bf3a2a8dd..06167095b 100644
--- a/perl-install/install/share/po/ja.po
+++ b/perl-install/install/share/po/ja.po
@@ -1,57 +1,82 @@
-# translation of DrakX.po to Japanese
-# Drakbootdisk Japanese translation
-# Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
-# YAMAGATA Hiroo <hiyori13@alum.mit.edu>, 2000.
-# UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2003, 2004.
-# Yukiko Bando <ybando@k6.dion.ne.jp>, 2004-2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2003-2004
+# YAMAGATA Hiroo <hiyori13@alum.mit.edu>, 2000
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-ja\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-03-22 21:11+0900\n"
-"Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
-"Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-26 19:12+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
+"language/ja/)\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "他�補助的�メディア��り���？"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -64,91 +89,89 @@ msgstr ""
 "\n"
 "他�設定�るメディア��り���？"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "�ットワーク (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "�ットワーク (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "�ットワーク (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "ミラー� URL"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL � ftp:// ��� http:// �始�ら��れ��り��ん"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "Mageia Linux �サイト�接続��ミラー�リストを�得�����..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "%s �サイト�接続��ミラー�リストを�得�����..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Mageia Linux ウェブサイト��接続�失敗�����利用�能�ミラー�リストを�"
-"得����ん���"
+"%s ウェブサイト��接続�失敗�����利用�能�ミラー�リストを�得����"
+"ん���"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "パッケージを�得�るミラーを�択"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS �設定"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "NFS メディア�ホスト��ディレクトリを入力������"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "ホスト���り��ん"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "ディレクトリ� \"/\" �始�ら��れ��り��ん"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS マウント�ホスト�"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "ディレクトリ"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "補助"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -157,23 +180,90 @@ msgstr ""
 "パッケージリスト�ファイル�見��り��ん。ミラー�場所�正���確����"
 "���。"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "インストール済�パッケージを探�����..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "更新�るパッケージを探�����..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -186,88 +276,88 @@ msgstr ""
 "\n"
 "�れら�パッケージを削除��よ������？\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "ファイル %s を読�込�中�エラー"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "次�ディスク����変更�れ���:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (変更����� %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "�ットワーク"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "メディアを�ん�����"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "ファイル�既�存在���。上書�����？"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "アクセス許���り��ん"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "�正� NFS �"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "�正�メディア %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "パーティション設定�終�る��スクリーンショット�撮れ��ん"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 "スクリーンショット� %s ��り��。インストール後�利用�能��り��。"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "インストール"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "設定"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "%s もフォーマット������"
@@ -291,22 +381,22 @@ msgstr "�ットワークを確立"
 msgid "Bringing down the network"
 msgstr "�ットワークを切断"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "ファイルを�得�����。�待�����。"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr ""
+msgstr "メディアを追加����ん"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "後�利用�る���パッケージをディスク�コピー"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "コピー�����"
@@ -336,7 +426,23 @@ msgstr "秀"
 msgid "maybe"
 msgstr "�"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"メディア %s � XML 情報������パッケージ %s �検索�果��完全��"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "説明��"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -345,335 +451,402 @@ msgstr ""
 "%s ��求�る�����パッケージをインストール����ん:\n"
 "%s"
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "エラー�発生����"
+msgstr ""
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "致命的�エラー�発生: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "次回�ら確����"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 件�インストール�失敗����"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "パッケージ %s をインストール"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "ワークステーション"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "オフィスワークステーション"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"オフィスソフト: ワープロ (OpenOffice.org Writer, Kword), 表計算 (OpenOffice."
-"org Calc, Kspread), PDF ビューア��"
+"オフィスソフト: ワープロ (LibreOffice Writer, Kword), 表計算 (OpenOffice.org "
+"Calc, Kspread), PDF ビューア��"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "ゲームステーション"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "ゲームプログラム: アーケードゲーム, ボードゲーム, 戦略ゲーム��"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "マル�メディアステーション"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "サウンド�動画��生/編集ソフト"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "インター�ットステーション"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "メール�ニュース���信用ツール (mutt,tin..) �ウェブブラウズ用ツール"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "�ットワーク (クライアント)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "ssh ����種プロトコル用クライアント"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "コンピュータ�設定を簡���るツール"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "コンソールツール"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "開発用"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "ドキュメント"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux/フリーソフト関連�文書�Howto"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base, サードパーティ�アプリケーションをサ�ート"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Web サー�"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "グループウェア"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolabサー�"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "ファイアウォール/ルータ"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "インター�ットゲートウェイ"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "メール/ニュース"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix メールサー�, Inn ニュースサー�"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "ディレクトリサー�"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP サー�"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "ドメイン�/�ットワークインフォメーションサー�"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "ファイル/プリンタ共有サー�"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "データベース"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL/MySQLデータベースサー�"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL/MariaDBデータベースサー�"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "メール"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix メールサー�"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL/MySQL データベースサー�"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL/MariaDB データベースサー�"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "�ットワークコンピュータサー�"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "グラフィカル環境"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE ワークステーション"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE - �����ツールを�む定番グラフィカル環境"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME ワークステーション"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, 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:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE デスクトップ"
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr "使�や��アプリケーション�デスクトップツールを�むグラフィカル環境"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "��他�グラフィカルデスクトップ"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm ��"
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "ユーティリティ"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH サー�"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin リモート設定サー�"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "�ットワークユーティリティ/モニタリング"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "モニタリングツール, プロセス管�, tcpdump, nmap..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia ウィザード"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "サー�設定ウィザード"
@@ -687,7 +860,7 @@ msgstr ""
 "エラー�発生����。���対処�る方法���り��ん。\n"
 "自己責任�続������。"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -706,253 +879,251 @@ msgstr "%s を開始\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux �インストール %s"
+msgid "%s Installation %s"
+msgstr "%s �インストール %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> 項目間を移動"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg サー��起動��時間���り��。�待�����..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"システム�リソース��分������Mageia Linux �インストール中�\n"
+"システム�リソース��分������%s �インストール中�\n"
 "�題�発生�る�能性��り��。��場��次��領�テキストモード�よる\n"
 "インストールを試��������。\n"
 "CD-ROM �ら起動 -> F1 を押� -> 'text' �入力"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Mageia KDE デスクトップをインストール"
+msgid "Media Selection"
+msgstr "メディア��択"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Mageia GNOME デスクトップをインストール"
+msgid "Install %s KDE Desktop"
+msgstr "%s KDE デスクトップをインストール"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "%s GNOME デスクトップをインストール"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "カスタムインストール"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE デスクトップ"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME デスクトップ"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "カスタムデスクトップ"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "%s デスクトップ�プレビュー��。"
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "画�をクリック�る�大��プレビュー�表示�れ��"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "パッケージグループを�択"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "パッケージを個別��択"
 
-# Changed "total size" to "total", due to problem of available
-# space on screen.
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "�計: %d/%d MB"
+msgid "Unselect All"
+msgstr "����択解除"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "�正�パッケージ"
+msgid "Total size: %d / %d MB"
+msgstr "�計: %d/%d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "�ージョン: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "サイズ: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "��性: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "��パッケージ��択/��択�変更����ん"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s ������"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s ��存を満���������"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s をアップグレード�る���"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s を維��る���"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "��パッケージ��択����ん。インストール�必��空�容���り��ん。"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "以下�パッケージをインストール���"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "以下�パッケージを削除���"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "�れ�必須パッケージ��。�択を解除�る�������ん。"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "��パッケージ��択�解除����ん。既�インストール�れ����。"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "��パッケージ��択�解除����ん。アップグレード�必���。"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "自動的��択�れ�パッケージを表示"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "インストール"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "�択を読�込む/�存�る"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "パッケージ��択を更新"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "最�インストール"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "ソフトウェア�管�"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "インストール�るパッケージを�ん�����"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "インストール中"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "詳細��"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "残り時間:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(試算�����...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d 個�パッケージ"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "���"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "設定"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "設定�れ����ん"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "メディア��択"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -961,84 +1132,84 @@ msgstr ""
 "次�インストールメディアを検出����。\n"
 "使用���も���れ�����択を解除������。"
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "インストール�る�� CD �内容を�ードドライブ�コピー�る��も�能��。\n"
 "���る�インストーラ��ードドライブ�らインストールを続���。コピー�れ"
 "�パッケージ�インストール完了後も利用����。"
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "CD 全体をコピー"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "エラー�発生����"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "キーボード��列を�ん�����"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "利用�能�����キーボード�リスト:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "インストール/更新"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "インストール�更新を�ん�����"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "インストール"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s ã‚’æ›´æ–°"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s �暗��"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "インストールを中止��システムを�起動"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "新��インストール"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "既存�システムをアップグレード (�推奨)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1046,46 +1217,18 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"インストーラ�既�インストール�れ��る Mageia Linux を\n"
-"安全� %s �アップグレード����ん���。\n"
-"\n"
-"アップグレード���新��インストール�る��を�勧����。\n"
-"\n"
-"警告: 「新��インストール�を�択�る���必�個人データ�\n"
-"�ックアップを作�������。"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE を設定"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"1 MB �ブートストラップ用�空�容���り��ん。インストールを続�����シ"
-"ステムを起動�る���DiskDrake �ブートストラップパーティションを作��る必"
-"���り��。"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"PPC PReP ブートストラップを作��る必���り��。インストールを続�����"
-"システムを起動�る���DiskDrake �ブートストラップパーティションを作��る"
-"必���り��。"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1097,12 +1240,12 @@ msgstr ""
 "\"%s\" ��� CD-ROM をドライブ�入れ�「OK�を押������。\n"
 "������場��「キャンセル�を押������。"
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "利用�能�パッケージを探�����..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1111,7 +1254,7 @@ msgstr ""
 "����システム��インストール���アップグレード�必��空�容���り�"
 "�ん (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1120,52 +1263,52 @@ msgstr ""
 "パッケージ��択を読�込む��存�る�を�ん�����。\n"
 "形�� auto_install �生��れ�ファイル�����。"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "読�込む"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "�存�る"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "�正�ファイル"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "デスクトップ��択"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "ワークステーション�デスクトッププロファイルを�択."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "指定�れ�サイズ�空�容�を超�����"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "インストール�種類"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1174,87 +1317,111 @@ msgstr ""
 "パッケージグループ��択�れ����ん。\n"
 "インストール�る最低��も�を�ん�����:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X を使�"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "パッケージ %s をインストール"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "基本的�ドキュメントを入れる (推奨)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "最���インストール (urpmi も��れ��ん)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "インストール�準備"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "パッケージ %s をインストール"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "パッケージを並�替�中�エラー�発生:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "続����？"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "�試行"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "��パッケージを飛��"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "メディア %s �����パッケージを飛��"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "メディア�パッケージ��択�戻る"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "パッケージ %s �インストール中�エラー�発生����。"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "インストール後�設定"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "更新モジュールメディア�ドライブ %s �入���る��を確�������"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "æ›´æ–°"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1274,28 +1441,29 @@ msgstr ""
 "\n"
 "更新�れ�パッケージをインストール����？"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s � %1$s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "�ードウェア"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "サウンドカード"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ISA サウンドカードを�使����？"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1304,81 +1472,70 @@ msgstr ""
 "インストール後� alsaconf � sndconfig を実行��サウンドカードを設定����"
 "��。"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "サウンドカード�見��り��ん。インストール後� harddrake ��度設定を試��"
 "����。"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "グラフィカルインターフェース"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "�ットワーク�インター�ット"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "プロキシ"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "設定済�"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "セキュリティレベル"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "ファイアウォール"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "有効"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "無効"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "X �設定�れ����ん。本当�よ������？"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "ブートローダを準備中..."
+msgid "Preparing initial startup program..."
+msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "��ら�時間���り��。�待�����。"
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"OldWorld も����明�アーキテク�ャ�マシンを�使��よ���。��マシン�"
-"� yaboot �動���ん。インストールを続�����マシンを起動�る���"
-"BootX も���他�方法�必���。'root fs' �カー�ル引数� 'root=%s' ��。"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1387,17 +1544,17 @@ msgstr ""
 "��セキュリティレベル���Windows パーティション�ファイル��アクセス�管"
 "�者����定�れ��。"
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "空�フロッピーをドライブ %s �入れ�����"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "インストール自動化フロッピーを作�中..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1408,12 +1565,12 @@ msgstr ""
 "\n"
 "本当�終了����？"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "����������"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "�起動"
@@ -1508,13 +1665,6 @@ msgid ""
 "Users"
 msgstr "ユーザ"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "�ットワーク"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1556,52 +1706,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "終了"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "オフィスソフト: ワープロ (kword,abiword), 表計算 (kspread,gnumeric), PDF "
-#~ "ビューア��"
-
-#~ msgid "Proceed"
-#~ msgstr "続行"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "ファイル %s をダウンロード中..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr ""
-#~ "32bit �ら 64bit ディストリビューション��アップグレード�サ�ート�れ�"
-#~ "���ん"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr ""
-#~ "64bit �ら 32bit ディストリビューション��アップグレード�サ�ート�れ�"
-#~ "���ん"
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "以下�サー�を�択�れ���: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "�れら�サー��デフォルト�起動�れ��。�在�既知�セキュリティ�題\n"
-#~ "��り��ん��新��発見�れる�も�れ��ん。��場�����る��\n"
-#~ "早急�アップグレード������。\n"
-#~ "\n"
-#~ "\n"
-#~ "本当��れら�サー�をインストール����？\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "IceWm デスクトップ"
diff --git a/perl-install/install/share/po/ko.po b/perl-install/install/share/po/ko.po
index 90b45a1f7..410ca7fb7 100644
--- a/perl-install/install/share/po/ko.po
+++ b/perl-install/install/share/po/ko.po
@@ -1,58 +1,82 @@
-# translation of ko(metanav).po to ahb hong-bae
-# Korean translation of drakbootdisk.
-# Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# changes asked by HP people -- pablo 2003-01-23
-#
-# Jaegeum Choe <baedaron@hananet.net>, 2001.
-# meta <hbahn@metq.com>, 2007.
+# Translators:
+# Jaegeum Choe <baedaron@hananet.net>, 2001
+# meta <hbahn@metq.com>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: ko(metanav)\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2007-06-18 14:54+0900\n"
-"Last-Translator: meta <hbahn@metq.com>\n"
-"Language-Team: ahb hong-bae <ko@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-26 19:22+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Korean (http://www.transifex.com/MageiaLinux/mageia/language/"
+"ko/)\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=0;\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr ""
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Home entertainment"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "For kids"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "For family!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "For developers!"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "추가할 미디어가 있습니까?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -65,90 +89,87 @@ msgstr ""
 "\n"
 "설정할 추가 설치 매체가 있습니까?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "�(HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "�(FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "�(NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "미러사�트� (URL)주소를 �어주십시오."
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL 주소는 ftp:// �는 http:// 로 시작�어야 합니다."
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "유효한 미러 목�� 받기 위해 Mageia Linux 홈페�지� 접� 중..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "유효한 미러 목�� 받기 위해 %s 홈페�지� 접� 중..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr ""
-"Mageia Linux 홈페�지� 접�하여 미러사�트목�� 받는 � 실패했습니다."
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr "%s 홈페�지� 접�하여 미러사�트목�� 받는 � 실패했습니다."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "패키지를 받� 미러 사�트를 선�하시오."
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "� 파� 시스템 (NFS) 구성"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "NFS 매체� 호스트 �름과 디렉토리를 입력해 주십시요."
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "호스트 �름� 찾� 수 없습니다"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "디렉토리는 \"/\"로 시작�어야 합니다."
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "� 파� 시스템(NFS)� 호스트 �름� 설치합니까?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "디렉토리"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "추가"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -156,23 +177,90 @@ msgid ""
 msgstr ""
 "미러 사�트�서 패키지 리스트를 찾� 수 없습니다. � 위치� 만드시겠습니까?"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "�미 설치� 패키지 찾는 중..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "업그레�드할 패키지를 검색중..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -185,87 +273,87 @@ msgstr ""
 "\n"
 "정� � 패키지들� 제거 하시겠습니까?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s 파�� �는중 오류가 발�했습니다."
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "다� 디스��름� 변경�었습니다. :"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (�전 �름� %s였�.)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP(하���스트 전송 규약)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP(파� 전송규약)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS(� 파� 시스템)"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "�"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "매체를 선�하시오"
 
-#: any.pm:1118
-#, fuzzy, c-format
+#: any.pm:1402
+#, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "파�� �미 존재합니다. �어쓸까요?"
+msgstr ""
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "권한� 없습니다."
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "부정확한 NFS �름입니다"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "알 수 없는 미디어 %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "파티션� 나누기 전�는 스�린샷� 만들 수 없습니다."
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "스�린샷� 설치 �후� %s� 위치 할 것입니다."
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
-msgstr "설치중"
+msgstr ""
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "설정"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "%s� �맷해야 합니다."
@@ -289,25 +377,25 @@ msgstr "� 활성화 중..."
 msgid "Bringing down the network"
 msgstr "� 해제 중..."
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "추후 사용하기 위해 디스�� 패키지 복사중... "
 
-#: media.pm:810
-#, fuzzy, c-format
+#: media.pm:805
+#, c-format
 msgid "Copying in progress"
-msgstr "검색 진행 중"
+msgstr "복사 진행중"
 
 #: pkgs.pm:32
 #, c-format
@@ -334,342 +422,424 @@ msgstr "좋� 패키지"
 msgid "maybe"
 msgstr "괜찮� 패키지"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "설명 없�"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "오류 발�"
+msgstr ""
 
-#: pkgs.pm:814
-#, fuzzy, c-format
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
+#, c-format
 msgid "%d installation transactions failed"
-msgstr "설치 실패."
+msgstr ""
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "%s 패키지 설치중"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "워�스테�션"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "오피스 워�스테�션"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"오피스 프로그램들: 워드프로세서 (OpenOffice.org Writer, Kword), 스프레드쉬트 "
-"(OpenOffice.org Calc, Kspread), PDF 뷰어, 등등"
+"오피스 프로그램들: 워드프로세서 (LibreOffice Writer, Kword), 스프레드쉬트 "
+"(LibreOffice Calc, Kspread), PDF 뷰어, 등등"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "게임 스테�션"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "간단한 게임모�: 아케�드, 보드, 전략 등등"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "멀티미디어 스테�션"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "사운드 � 비디오 연주/편집 프로그램"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "�터넷 스테�션"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "메�/뉴스를 �고 보내며 (mutt, tin..) 웹검색� 하기 위한 �구모�"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "� 컴퓨터 (���언트)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "SSH를 �함한 여러 프로토콜� ���언트"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "쉽게 컴퓨터 설정� 하기 위한 �구"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "콘솔 �구"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "개발"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "문서"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "리눅스 기본 규격(Linux Standard Base)"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "리눅스 기본 규격. 외부 애플리케�션 지�"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "웹 서버"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "아파치"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "그룹웨어"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab 서버"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "방화벽/�우터"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "�터넷 게�트웨�"
 
-#: share/meta-task/compssUsers.pl:84
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:92
+#, c-format
 msgid "Mail/News"
-msgstr "/파�(F)/새로 만들기(_N)"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:85
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:93
+#, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "�스트픽스 메� 서버"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "디렉토리 서버"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP 서버"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "�메� �름 서버/� 정보 서버"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "�메� �름 � � 정보 서버"
 
-#: share/meta-task/compssUsers.pl:100
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:112
+#, c-format
 msgid "File and Printer Sharing Server"
-msgstr "프린터 서버"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "��터베�스"
 
-#: share/meta-task/compssUsers.pl:105
-#, fuzzy, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL �는 MySQL ��터베�스 서버"
+#: share/meta-task/compssUsers.pl:118
+#, c-format
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "웹/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "아파치와 프로FTPD"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "메�"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "�스트픽스 메� 서버"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL �는 MySQL ��터베�스 서버"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL �는 MariaDB ��터베�스 서버"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "� 컴퓨터 서버"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS 서버, 삼바 서버, 프�시 서버, SSH 서버"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "그래픽 환경"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "K �스�탑 환경 기반 워�스테�션"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "K Desktop 환경, 여러가지 �구를 수반한 기본 그래픽 환경"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 워�스테�션"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "사용� 친화� �용 프로그램들과 �스�탑 �구들� 가진 그래픽 환경"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "IceWm �스�탑"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr "사용� 친화� �용 프로그램들과 �스�탑 �구들� 가진 그래픽 환경"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "기타 그래픽 �스�탑"
 
-#: share/meta-task/compssUsers.pl:150
-#, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, 윈�우 메�커, ���튼먼트, Fvwm, 등등"
+#: share/meta-task/compssUsers.pl:200
+#, c-format
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "유틸리티"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH 서비스"
 
-#: share/meta-task/compssUsers.pl:180
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:230
+#, c-format
 msgid "Webmin"
-msgstr "웹민 서비스"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin �격 설정 서버"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "� 유틸리티들/�시"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "�시 �구, 프로세스 관리, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:240
+#, c-format
 msgid "Mageia Wizards"
-msgstr "맨드리바 제어 센터"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "서버 설정 �우미"
@@ -683,7 +853,7 @@ msgstr ""
 "오류가 발�했지만, 처리할 수 없습니다.\n"
 "위험� �수하려면 계�하세요."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -703,252 +873,246 @@ msgstr "%s 단계로 넘어갑니다.\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux 설치 %s"
+msgid "%s Installation %s"
+msgstr "%s 설치 %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> 항목간 ��"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"시스템� ��� 부족합니다. 맨드리바 리눅스를 설치하는� \n"
-"�부 문제가 발�할 수� 있습니다.\n"
-"문제가 발�하면 �스트모드로 재설치하십시오.\n"
-"�스트 모드 설치는 CDROM으로 부팅후 「F1�� 누르고 「text�를 입력하시면 �"
-"니다."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Media Selection"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr ""
+
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "최소 설치"
+msgstr ""
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "IceWm �스�탑"
+msgstr "�스�톱"
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "IceWm �스�탑"
+msgstr "�스�톱"
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "IceWm �스�탑"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "패키지 그룹 선�"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "개별 팩키지 선�"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "전체 �기: %d / %d MB"
+msgid "Unselect All"
+msgstr "모든 선� 해제"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "잘못� 팩키지"
+msgid "Total size: %d / %d MB"
+msgstr "전체 �기: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "�"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "�기: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d 킬로 바�트\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "중요�: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "� 패키지를 선�/버림 할 수 없습니다."
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s 가 없�"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s 비충족"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s 를 활성화하기 위해 시�중"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s를 유지하기 위해"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "� 패키지 선�할 수 없� - 디스� 공간 부족"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "다� 패키지들� 설치합니다."
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "다� 패키지들� 제거합니다."
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "�것� 필수 패키지�므로 제거할 수 없습니다."
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "선�해제할 수 없� - �미 설치� 패키지입니다."
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "선�해제할 수 없� - 업그레�드 필."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "�� 선� 패키지들 보기"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "설치"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "열기/저장 선�"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "선�� 패키지 목� 업��트 중"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "최소 설치"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "소프트웨어 관리"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "설치할 패키지를 선�하시오."
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "설치중"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "�세설명 �략"
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "남� 시간 "
+msgstr ""
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "계산 중"
+msgstr ""
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
-msgstr[0] "%d 패키지"
-msgstr[1] "%d 패키지"
+msgstr[0] ""
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "요약설명"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "설정"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "설정�지 않�"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "패키지 그룹 선�"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -957,84 +1121,84 @@ msgstr ""
 "다� 설치 매체를 찾았습니다.\n"
 "설치 하지 않으려면 설치해제하십시오."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "설치 전� 하드 드��브로 CDROM� 있는 컨�츠를 복사할 수 있습니다.\n"
 "그러면 하드 드��브� 설치한 후�� 패키지는 시스템� 남아서 재설치가 가능합"
 "니다."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "전체 CD 복사"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "오류 발�"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "키보드 구성� 선�하시오"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "지��는 키보드 목�입니다."
+msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "설치/업그레�드"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "설치합니까 아니면 업그레�드 합니까?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
-msgstr ""
+msgstr "설치"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "업그레�드 %s"
 
-#: steps_interactive.pm:172
-#, fuzzy, c-format
+#: steps_interactive.pm:184
+#, c-format
 msgid "Encryption key for %s"
-msgstr "암호화 키"
+msgstr ""
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "설치중"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1043,38 +1207,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE 설정중"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"1MB 부트스트랩 공간 부족! \n"
-"설치는 계�할 수 있지만, 시스템� 부팅하기 위해서는 DiskDrake�서 부트스트랩 "
-"파티션� 만들어야 합니다."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"PPC PReP Boot 부트스트랩 �성� 필요합니다!\n"
-"설치는 계�할 수 있지만, 시스템� 부팅하기 위해서는 DiskDrake�서 부트스트랩 "
-"파티션� 만들어야 합니다."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1087,12 +1230,12 @@ msgstr ""
 "「%s��고 쓰여진 CDROM� 드��브� 넣� 후, 「확��� 눌러 주세요.\n"
 "만약 CDROM� 가지고 있지 않다면, 「취소�를 눌러 추가 설치를 취소하세요."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "유효한 패키지를 찾고 있습니다."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1101,7 +1244,7 @@ msgstr ""
 "현재 시스템�는 설치 �는 업그레�드 할만한 충분한 공간� \n"
 "남아있지 않습니다.(%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1110,52 +1253,52 @@ msgstr ""
 "패키지 선�목�� 불러올지 혹� 저장할지를 선�하세요.\n"
 "형�(�맷)� ��설치 �성 파�과 ��합니다."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "불러오기"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "저장"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "��� 파� 혹� 없는 파�입니다."
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "그놈"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "패키지 그룹 선�"
+msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "선�� 용량� 사용할 수 있는 공간보다 �니다."
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "설치 타입"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1164,87 +1307,111 @@ msgstr ""
 "어떤 패키지 그룹� 선��지 않았습니다.\n"
 "패키지 최소설치 ���  선�하십시오."
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X �함"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "%s 패키지 설치중"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "기본 문서 �함(추천!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "최소 설치(특히 urpmi사용안함)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "설치 준비중입니다"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s 패키지 설치중"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "패키지를 정렬하는 중 오류발�:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "계� 진행합니까?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "재시�"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "� 패키지는 설치하지 않고 지나가기"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\"�서 모든 패키지를 설치하지 않�"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "미디어나 패키지 선�목�으로 �아가기"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "다� 패키지 설치중 오류 발�: %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "설치 후 환경설정"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "업��트 모듈 매체가 %s 드��브� 있�� 하십시오."
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "업��트"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1262,28 +1429,29 @@ msgstr ""
 "� 패키지들� 다운로드 받으려면 �터넷� 연결�어 있어야 합니다.\n"
 "업��트를 설치 하시겠습니까?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s (%s 컴퓨터)"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "하드웨어"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "사운드 카드"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ISA 사운드 카드가 있습니까?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1292,83 +1460,70 @@ msgstr ""
 "사운드 카드를 설정하려면 설치 후�\n"
 "「alsaconf� �는 「sndconfig�명령� 실행해주십시요."
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "사운드 카드가 발견�지 않았습니다.\n"
 "설치 후�「harddrake�명령� 실행해주십시요."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "시작시 바로 X-Window 실행"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "�과 �터넷"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "프�시"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "재설정�었습니다."
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "보안 등급"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "방화벽"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "활성화"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "금지"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "X 설정� �지 않았습니다. 설정하시겠습니까?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "부트 로� 준비중"
-
-#: steps_interactive.pm:1027
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Be patient, this may take a while..."
+msgid "Preparing initial startup program..."
 msgstr ""
 
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1041
 #, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
+msgid "Be patient, this may take a while..."
 msgstr ""
-"예전 모��거나 알 수 없는 컴퓨터입니다.\n"
-"yaboot 부트로�는 작��지 않� 것입니다.\n"
-"설치를 계� 진행하지만, 컴퓨터를 부팅하기 위해서\n"
-"BootX나 �는 몇몇 방법� �야 �수� 있습니다. \n"
-"root fs를 위한 kernel argument : root=%s"
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1377,17 +1532,17 @@ msgstr ""
 "� 보안 등급�서는 윈�우즈 파티션�서� 파� 접근� 관리�� �해 제한 �니"
 "다."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s 드��브� 빈 플로피 디스�를 넣으세요"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "�� 설치 플로피 디스� �성 중"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1398,12 +1553,12 @@ msgstr ""
 "\n"
 "정� 지금 종료 하시겠습니까?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "축하합니다."
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "다시 시작"
@@ -1419,7 +1574,7 @@ msgstr "언어"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "지역화"
 
 #: steps_list.pm:17
 #, c-format
@@ -1498,13 +1653,6 @@ msgid ""
 "Users"
 msgstr "사용�들"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "� 설정"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1546,153 +1694,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "종료"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "오피스 프로그램들: 워드프로세서 (kword, abiword), 스프레드쉬트 (kspread,"
-#~ "gnumeric), pdf 뷰어, 등등"
-
-#, fuzzy
-#~ msgid "Downloading file %s..."
-#~ msgstr "파� 전송 중 ..."
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "다� 서버들� 선��었습니다: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "� 서버들� 기본 설정� 활성화�태입니다. 알려진 보안 문제는 없지만, 새로"
-#~ "운 문제�� 발견� 수� 있습니다.\n"
-#~ " 그럴 경우�는 가능한 한 신�하게\n"
-#~ "업그레�드해야 합니다.\n"
-#~ "\n"
-#~ "\n"
-#~ "정�로 � 서버들� 설치합니까?\n"
-
-#, fuzzy
-#~ msgid "IceWm Desktop"
-#~ msgstr "�터"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "사용할 패키지� 리스트를 미러 사�트�서 받습니다."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "미러사�트 %s� 접�할 수 없습니다"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "�� 설치 플로피 디스� �성"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "�� 설치는 �한다면 완벽한 ��화가 가능합니다.\n"
-#~ "�럴 경우, 하드 드��브를 �유해 버립니다!\n"
-#~ "(�것� � 다른 컴퓨터� ��하게 설치할 때를 위한 것입니다.)\n"
-#~ "�반�으로 �접 설치하는 것� 좋습니다.\n"
-
-#~ msgid "Replay"
-#~ msgstr "재시�"
-
-#~ msgid "Automated"
-#~ msgstr "��"
-
-#~ msgid "Save packages selection"
-#~ msgstr "선�� 패키지 목� 저장"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "aboot를 사용하시겠습니까?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "aboot 설치 실패. \n"
-#~ "강제설치합니까? - 첫번째 파티션� 훼�� 수 있습니다."
-
-#~ msgid "All"
-#~ msgstr "모�"
-
-#~ msgid "TV card"
-#~ msgstr "TV 카드"
-
-#~ msgid "Arkeia"
-#~ msgstr "아르케�아"
-
-#~ msgid "Flatout"
-#~ msgstr "플래트아웃(최고��로)"
-
-#~ msgid "Gwenview"
-#~ msgstr "Gwenview"
-
-#~ msgid "3D"
-#~ msgstr "3차�"
-
-#~ msgid "CMS"
-#~ msgstr "CMS"
-
-#~ msgid "CRM"
-#~ msgstr "CRM"
-
-#~ msgid "2007 product line"
-#~ msgstr "2007 제품 ��"
-
-#~ msgid "Invictus Firewall"
-#~ msgstr "�빅투스 방화벽"
-
-#~ msgid "Discovery Live Mode"
-#~ msgstr "Discovery Live Mode"
-
-#~ msgid "How to register"
-#~ msgstr "등�하는 법"
-
-#~ msgid "Rpmdrake 2"
-#~ msgstr "Rpmdrake 2"
-
-#~ msgid "Mandriva Online Services"
-#~ msgstr "맨드리바 온�� 서비스"
-
-#~ msgid "New Theme"
-#~ msgstr "새 테마"
-
-#~ msgid "Web 2.0"
-#~ msgstr "웹 2.0"
-
-#~ msgid "Kaspersky"
-#~ msgstr "�스� 스카�(�터넷보안업체)"
-
-#~ msgid "LinDVD"
-#~ msgstr "LinDVD"
-
-#~ msgid "Skype"
-#~ msgstr "스카�프(�터넷 전화)"
-
-#~ msgid "Transgaming/Cedega"
-#~ msgstr "Cedega - 윈�우용 게임 실행기"
-
-#~ msgid "DrakVPN"
-#~ msgstr "드레��VPN - 가�사설통신�"
-
-#~ msgid "Boot"
-#~ msgstr "부트"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "사용� ��"
diff --git a/perl-install/install/share/po/ky.po b/perl-install/install/share/po/ky.po
index fe6e39dc0..15f6bf74e 100644
--- a/perl-install/install/share/po/ky.po
+++ b/perl-install/install/share/po/ky.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2009-04-18 19:08+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kyrgyz\n"
@@ -19,38 +19,63 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Сиздин иш �толуңуз USBде"
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Офи� �танци��ы"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "100%% ачык кодду Mageia Linux ди�трибутиви"
+msgid "Home entertainment"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Linux'ту Mageia One менен аралап үйрөнүү"
+msgid "For kids"
+msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Толук Mageia Linux иш �толу жардам менен"
+msgid "For family!"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: ар бирдин керектеген ди�трибутив"
+msgid "For developers!"
+msgstr ""
 
-#: any.pm:109
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Сизде кийинки кезектеги кошумча алып жүрүүчү барбы?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -63,91 +88,88 @@ msgstr ""
 "\n"
 "Ыра�тоолор үчүн кошумча булагы дагы барбы?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Желе (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Желе  (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Тармак (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Күзгү�үнүн URL'и?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL ftp:// же http:// менен башталышы керек"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "Бар болгон күзгүлөр тизме�ин Mageia Linux веб �айтындан алынууда..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Бар болгон күзгүлөр тизме�ин %s веб �айтындан алынууда..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Бар болгон күзгүлөр тизме�ин Mageia Linux веб �айтындан алынууда ийгилик�из "
-"ай�ктады..."
+"Бар болгон күзгүлөр тизме�ин %s веб �айтындан алынууда ийгилик�из ай�ктады..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Пакеттерди алуучу күзгүнү тандаңыз"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS орнотуу"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "NFS топтомунун компьютер атын жана директори��ын кириңиз"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Түйюндүн аты көр�өтүлгөн жок"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Директори� \"/\" белги менен башталышы керек"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS туташуунун түйюн аты ?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Каталог"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Кошумча"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -156,23 +178,90 @@ msgstr ""
 "Бул күзгүдө пакеттердин тизме�и атбылган жок. Жайгашуу�унун тууралыгын "
 "текшериңиз."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, fuzzy, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "\"%s\" ичинен бардык пакеттерди аттап өтүү"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Орнотулган пакеттер изделип жатат..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Жаңыланычуу пакеттер изделип жатат..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -186,87 +275,87 @@ msgstr ""
 "\n"
 "Бул пакеттердин алынып ташталуу�ун каалай�ызбы?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s файлын окуудагы ката"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Төмөнкү ди�к(тер)дин аты өзгөртүлдү:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (мурунку аты %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Желе"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "�лып жүрүүчүнү тандаңыз"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Файл алдагачан бар. Ү�түнө кайра жазыл�ынбы?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Кирүү укугу четке кагылды"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Жаман NFS аты"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "%s жарак�ыз алып жүрүүчү"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Бөлүмдөрдү жаратууга чейин �криншотторду түзүүгө болбойт"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Орнотуудан кийин �криншоттор %s ичинде болот"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Орнотуу"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Конфигураци�лоо"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Сиз %s дагы форматташыңыз керек"
@@ -291,22 +380,22 @@ msgstr "Тармак көтөрүлүүдө"
 msgid "Bringing down the network"
 msgstr "Тармак өчүрүлүүдө"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Күтө туруңуз, файл жүктөлүп жатат"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "булак кошулган жок"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "К��бир пакеттерди келечекте колдонуу үчүн ди�кке көчүрүп жатат"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Көчүрүү жүрүүдө"
@@ -336,7 +425,24 @@ msgstr "жакшы"
 msgid "maybe"
 msgstr "болушу мүмкүн"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"\"%s\" булагында xml-info табылган жок. %s пакети үчүн жарым ганарезультат "
+"алынды"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Ба�ндалбады"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -345,69 +451,79 @@ msgstr ""
 "%s менен талап кылынган к��бир пакеттер орнотула алган жок:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Жаңылыштык орун алды:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Фаталдык ката пайда болду: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d орнотуу транзакци�лары ишке ашпады"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Пакеттердин орнотулушу ийгилик�из а�ктады:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Иш �танци��ы"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Офи� �танци��ы"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Офи� программалары: тек�т проце��орлору (OpenOffice.org Writer, Kword), "
-"�лектрондук таблицалар  (OpenOffice.org Calc, Kspread), pdf файлдарын көрүү "
+"Офи� программалары: тек�т проце��орлору (LibreOffice Writer, Kword), "
+"�лектрондук таблицалар  (LibreOffice Calc, Kspread), pdf файлдарын көрүү "
 "программалары, ж.б."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Оюн �танци��ы"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 "Оюн-зоок программалары: аркада оюндары, тактай оюндары, �тратеги� оюндары, ж."
 "б."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Мультимедиа �танци��ы"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Үн жана видео ойнотуу/терүү программалары"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Интернет �танци��ы"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -416,196 +532,196 @@ msgstr ""
 "Почтаны жана жаңылыктарды (mutt, tin..) окууга жана жөнөтүүгө, жана вебде "
 "иштөөгө арналган куралдар тобу"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Тармак компьютери (клиент)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "�р түрдүү протоколдор клиенттери, ssh да кошулган"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Компьютериңизди жеңил конфигураци�лоо куралдары"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Кон�оль куралдары"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Иштеп түзүү"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Документаци�"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux жана Free Software жөнүндөгү китептер жана HOWTOлар"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 "Linux �тандарттык база�ы. Үчүнчү тараптык иштеп чыгуучулардын тиркемелерин "
 "колдоо"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Веб-�ервери"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab �ервери"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Файрволл/Маршруттагыч"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Интернет дарбаза�ы"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Почта/Жаңылыктар"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix почта �ервери, Inn жаңылыктар �ервери"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Каталогдор �ервери"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP �ервери"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "DNS жана NIS"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Файл жана принтер бөлүшүү �ервери"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Берилиштер база�ы"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL жана MySQL берилиштер база�ынын �ервери"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL жана MariaDB берилиштер база�ынын �ервери"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Почта"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix почта �ервери"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL же MySQL берилиштер база�ынын �ервери"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL же MariaDB берилиштер база�ынын �ервери"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Тармак �ервери"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Графикалык чөйрө"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE иш �танци��ы"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -614,12 +730,12 @@ msgstr ""
 "K Desktop Environment - негизги графикалык чөйрө, кошумча куралдар "
 "коллекци��ы менен"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME иш �танци��ы"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -628,66 +744,129 @@ msgstr ""
 "Колдонуучуга ыңгайлашкан тиркемелерин жана иш �толунун кураларын камтыган "
 "графикалык чөйрө"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE иш �танци��ы"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Колдонуучуга ыңгайлашкан тиркемелерин жана иш �толунун кураларын камтыган "
+"графикалык чөйрө"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME иш �танци��ы"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Иш �танци��ы"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Графикалык чөйрө"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "LXDE иш �толу"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Колдонуучуга ыңгайлашкан тиркемелерин жана иш �толунун кураларын камтыган "
+"графикалык чөйрө"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE иш �толу"
 
-#: share/meta-task/compssUsers.pl:146
-#, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Колдонуучуга ыңгайлашкан тиркемелерин жана иш �толунун кураларын камтыган "
 "графикалык чөйрө"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Менчик иш �толу"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"K Desktop Environment - негизги графикалык чөйрө, кошумча куралдар "
+"коллекци��ы менен"
+
+#: share/meta-task/compssUsers.pl:199
 #, 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:200
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, ж.б. "
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Утилиталар"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH �ервери"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin узактан башкаруу �ервери"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Тармак а�паптары/Мониторинг"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Мониторинг а�паптар, проце�� ��ептүүчүлөр, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia У�талары"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Серверди ыра�тоо у�талары"
@@ -701,7 +880,7 @@ msgstr ""
 "Жаңылыштык орун алды, бирок мен аны кантип туура иштетүүнү билбейм.\n"
 "Мындан ары тобокелге �алып өзүңүз улантыңыз."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -721,252 +900,252 @@ msgstr "`%s' кадамына өтүү аракети\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux %s орнотуу"
+msgid "%s Installation %s"
+msgstr "%s %s орнотуу"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> �лементтер орто�унда"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg жай башталып жатат. Күтө туруңуз..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Си�темага жетеринче ре�ур� жетпей жатат. Mageia Linux �и�тема�ын\n"
+"Си�темага жетеринче ре�ур� жетпей жатат. %s �и�тема�ын\n"
 "орнотууда проблемалар чыгышы мүмкүн. �ндай бол�о тек�ттик режимде\n"
 "орнотууну текшерип көрүңүз. �л үчүн, ди�ктен жүктөлүп жаткан учурда\n"
 "`F1' клавиша�ын ба�ып `text' �өзүн кириңиз."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr "Пакеттердин группа�ын тандоо"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Mageia KDE иш �толун орнотуу"
+msgid "Install %s KDE Desktop"
+msgstr "%s KDE иш �толун орнотуу"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Mageia GNOME иш �толун орнотуу"
+msgid "Install %s GNOME Desktop"
+msgstr "%s GNOME иш �толун орнотуу"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Менчик орнотуу"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE иш �толу"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME иш �толу"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Менчик иш �толу"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Мына '%s' иш �толдун алдын ала көрүнүшү."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Чоң көрүнүштү көрүү үчүн �үрөткө ба�ыңыз"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Пакеттердин группа�ын тандоо"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Пакеттерди өз алдынча тандоо"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Жалпы көлөмү: %d / %d Мб"
+msgid "Unselect All"
+msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Туура �ме� пакет"
+msgid "Total size: %d / %d MB"
+msgstr "Жалпы көлөмү: %d / %d Мб"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Вер�и��ы: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Көлөмү: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d Кб\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Маанилүүлүгү:"
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Сиз бул пакетти тандап/тандабай албай�ыз"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s жоктугунан"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s канаатанбагандыгынан"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s активдештирүү аракети"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s �актоо үчүн"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Сиз бул пакетти тандап алалбай�ыз, анткени аны орнотуу үчүн жетеринче бош "
 "боштук жок"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Төмөнкү пакеттер орнотуулат"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Төмөнкү пакеттер өчүрүлөт"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Бул орнотууга шарт болгон пакет, пакетти тандап алалбай�ыз"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Бул пакетти тандап алалбай�ыз. Пакет алда качан орнотулган"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Бул пакетти белгилөөдөн алып �алууга болбойт. �л жаңыланышы керек"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "�втоматтык түрдө тандалган пакеттерди көр�өтүү"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Орнотуу"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Тандалгандарды Жүктөө/Сактоо"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Пакеттерди тандоо жаңыланууда"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Минималдык орнотуу"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Пакеттерди башкаруу"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Сиз орнотууну каалаган пакеттерди тандаңыз"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Орнотуу"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Кеңири маалымат�ыз"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Калган убакыт:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(болжолдуу убакыт..)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d- пакет"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Жыйынтык"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Конфигураци�"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "конфигураци�ланбаган"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Пакеттердин группа�ын тандоо"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -975,12 +1154,12 @@ msgstr ""
 "Төмөнкү орнотуу булактары табылды.\n"
 "Эгерде к��бирин аттап өтүүнү каала�аңыз, анда аларды тандабай өтүңүз."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Компакт-ди�к мазмунун орнотуудан мурун компьютер ди�кине көчүрүп алуу "
@@ -988,72 +1167,72 @@ msgstr ""
 "�ндан кийин орнотуу компьютер ди�кинен улантылат жана пакеттер толук "
 "�и�теманын орнотулуп бүткөндөн кийин калышат."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "CD ди�кти толугу менен көчүрүү"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Жаңылыштык орун алды"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Өзүңүздүн алиптакта карта�ын тандаңыз"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Мүмкүн болгон бардык клавиөлкөлөр тизме�и"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Орнотуу/Жаңылоо"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Бул орнотуубу же жаңылообу?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Орнотуу"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s жаңылоо"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s үчүн шифрлөө ачкычы"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Орнотууну айну, �и�тема өчүп жандыруу"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Жаңы орнотуу"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Мурунку орнотууну жаңылоо (�унуш кылынбайт)"
 
-#: steps_interactive.pm:211
-#, c-format
+#: steps_interactive.pm:223
+#, fuzzy, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1061,7 +1240,7 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Орноткуч учурдагы орнотулган Mageia Linux �и�теманын %s жаңылоо�ун\n"
+"Орноткуч учурдагы орнотулган Mageia �и�теманын %s жаңылоо�ун\n"
 "толук алалбашы мүмкүн.\n"
 "\n"
 "Учурдагы �и�теманы жаңыдан жаңы вер�и��ы менен орнотуу �унушталат.\n"
@@ -1069,37 +1248,17 @@ msgstr ""
 "Э�кертүү : \"Жаңы орнотулуш\" тандоодон мурун, бардык жеке\n"
 "маалыматтарды архивдөө менен көчүрүп алышыңыз керек."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE конфигураци�ланууда"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Өз жүктөлүү программа�ы үчүн жетеринче бош боштук калган жок! Орнотуу "
-"улантылат, бирок �и�теманын жүктөлүшү үчүн DiskDrake менен баштапкы жүктөлүү "
-"бөлүгүн түзүү керек"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"PPC PReP жүктөлүү бөлүгүн түзүү керек! Орнотуу улантылат, бирок �и�теманын "
-"жүктөлүшү үчүн DiskDrake менен баштапкы жүктөлүү бөлүгүн түзүү керек"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1112,12 +1271,12 @@ msgstr ""
 "Эгерде �изде жок бол�о, анда ушул компакт-ди�ктен орнотууну айнуу үчүн "
 "\"�йнуу\" ба�кычын ба�ыңыз."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Мүмкүн болгон пакеттер изделүүдө..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1126,7 +1285,7 @@ msgstr ""
 "Си�темаңыз орнотууга же жаңылоого жетеринче бош боштукка �� �ме� (%d МБ > %d "
 "МБ)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1135,52 +1294,52 @@ msgstr ""
 "Жүктөө же пакеттер тандоо�ун �актоону тандаңыз.\n"
 "Файлдар форматы автоматтык орнотууда түзүлгөн файлдар менен окшош."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Жүктөө"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Сактоо"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Туура �ме� файл"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Иш �толун тандоо"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Иштоо �танци�ңыздын иш �толдун профилин тандап ала�ыз."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Тандалган өлчөм бар болгон боштуктан чоң"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Орнотуу тиби"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1189,87 +1348,111 @@ msgstr ""
 "Эч кандай пакеттер группа�ы тандалган жок.\n"
 "Минималдык орнотуу тибин тандаңыз:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X менен"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "%s пакети орнотуулууда"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Башкы документаци� менен (�унушталат!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Чыныгы минималдуу орнотуулуш (атайын urpmi'�из)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Си�тема жүктөөгүч да�рдалууда..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Орнотуу да�рдалууда"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s пакети орнотуулууда"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Пакеттерди кабыл алууда ката пайда болду:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Буга карабай улантайынбы?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Кайталоо"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Бул пакетти аттап өтүү"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\" ичинен бардык пакеттерди аттап өтүү"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "�ртка баруу жана орнотууга пакеттерди нандоо"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "%s пакетти орнотууда ката чыкты."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Орнотуулуштан кийинки ыра�тоолор"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "%s ичинде Update Modules топтомунун бар �кендигин текшерип көрүңүз"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Жаңылоолор"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1290,28 +1473,29 @@ msgstr ""
 "\n"
 "Пакеттер орнотул�унбу?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s %s'да"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Техникалык жабдуу"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Добуш карта�ы"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Сизде ISA добуш карточка�ы барбы?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1320,82 +1504,70 @@ msgstr ""
 "Үн карта�ын ыра�тоо үчүн орнотуудан кийин \"alsaconf\" же \"sndconfig\" "
 "коммандаларын аткарыңыз"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Эч кандай добуш карточка�ы табылган жок. Орнотуудан кийин \"harddrake\" "
 "кайталап көрүңүз"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Графикалык интерфей�"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Тармак жана Интернет"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Прок�илер"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "ыра�талды"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Коо�уздук деңг��ли"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Файервол"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "активдештирилди"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "өчүк"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Сиз X'ти ыра�таган жок�уз.Чындап ушуну каалай�ызбы?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Си�тема жүктөөгүч да�рдалууда..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Орнотуу да�рдалууда"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Күтө туруңуз, бул бир нече убакытты алышы мүмкүн..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Сиз өтө ��ки тарыхый же белги�из машинанын ���и окшой�уз жана 'yaboot' "
-"баштапкы жүктөгүчү машинаңызга иштебеши мүмкүн. Орнотуу улантылат, бирок "
-"�и�теманын жүктөлүшү үчүн 'BootX' же башка жүктөгүч колдонулушу керек. "
-"Ядронун тамырдык файл �и�теманын параметри: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1404,17 +1576,17 @@ msgstr ""
 "Бул кооп�удук деңг��лде Windows бөлүмүндө жайгашкан файларда жетүү жалгыз "
 "гана админи�траторга урук�ат берилген."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s ичине бош флоппи ди�кти киргизиңиз"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "�вто орнотуу флоппини түзүү..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1425,12 +1597,12 @@ msgstr ""
 "\n"
 "Сиз чындап азыр чыгууну каалай�ызбы?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Конфигураци�лар"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Кайра жүктөө"
@@ -1525,13 +1697,6 @@ msgid ""
 "Users"
 msgstr "Колдонуучулар"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Тармактар"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1574,6 +1739,78 @@ msgid ""
 "Exit"
 msgstr "Чыгуу"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Си�тема жүктөөгүч да�рдалууда..."
+
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Колдонуучуга ыңгайлашкан тиркемелерин жана иш �толунун кураларын камтыган "
+#~ "графикалык чөйрө"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Менчик иш �толу"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "Өз жүктөлүү программа�ы үчүн жетеринче бош боштук калган жок! Орнотуу "
+#~ "улантылат, бирок �и�теманын жүктөлүшү үчүн DiskDrake менен баштапкы "
+#~ "жүктөлүү бөлүгүн түзүү керек"
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "PPC PReP жүктөлүү бөлүгүн түзүү керек! Орнотуу улантылат, бирок "
+#~ "�и�теманын жүктөлүшү үчүн DiskDrake менен баштапкы жүктөлүү бөлүгүн түзүү "
+#~ "керек"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Сиз өтө ��ки тарыхый же белги�из машинанын ���и окшой�уз жана 'yaboot' "
+#~ "баштапкы жүктөгүчү машинаңызга иштебеши мүмкүн. Орнотуу улантылат, бирок "
+#~ "�и�теманын жүктөлүшү үчүн 'BootX' же башка жүктөгүч колдонулушу керек. "
+#~ "Ядронун тамырдык файл �и�теманын параметри: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Кош келиңиз"
+
+#~ msgid "Bad package"
+#~ msgstr "Туура �ме� пакет"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Си�тема жүктөөгүч да�рдалууда..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Тармактар"
+
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Сиздин иш �толуңуз USBде"
+
+#~ msgid "The 100%% open source Mageia distribution"
+#~ msgstr "100%% ачык кодду Mageia ди�трибутиви"
+
+#~ msgid "Explore Linux easily with Mageia One"
+#~ msgstr "Linux'ту Mageia One менен аралап үйрөнүү"
+
+#~ msgid "A full Mageia desktop, with support"
+#~ msgstr "Толук Mageia иш �толу жардам менен"
+
+#~ msgid "Mageia: distributions for everybody's needs"
+#~ msgstr "Mageia: ар бирдин керектеген ди�трибутив"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
diff --git a/perl-install/install/share/po/lt.po b/perl-install/install/share/po/lt.po
index 85bcb1171..74177e3c0 100644
--- a/perl-install/install/share/po/lt.po
+++ b/perl-install/install/share/po/lt.po
@@ -1,14 +1,19 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Moo, 2015
 # Mykolas Norvai-as <Myka@centras.lt>, 2002
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX VERSION\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2000-12-23 13:50+0200\n"
-"Last-Translator: Mykolas Norvai­as <Myka@centras.lt>\n"
-"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-12-20 22:56+0000\n"
+"Last-Translator: Moo\n"
+"Language-Team: Lithuanian (http://www.transifex.com/MageiaLinux/mageia/"
+"language/lt/)\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,38 +21,63 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, c-format
+msgid "Office tools"
+msgstr ""
+
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Home entertainment"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Vaikams"
+
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "For family!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "For developers!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Thank you!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Be Free!"
 msgstr ""
 
-#: any.pm:109
-#, fuzzy, c-format
+#: any.pm:151
+#, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Ar turi dar vienÄ…?"
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -55,115 +85,185 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
+"Šios laikmenos buvo rastos ir bus naudojamos įdiegimo metu: %s.\n"
+"\n"
+"\n"
+"Ar turite papildomą įdiegimo laikmeną, kurią norite konfigūruoti?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
-#, fuzzy, c-format
+#: any.pm:163
+#, c-format
 msgid "Network (HTTP)"
-msgstr "Tinklo interfeisas"
+msgstr "Tinklas (HTTP)"
 
-#: any.pm:122
-#, fuzzy, c-format
+#: any.pm:164
+#, c-format
 msgid "Network (FTP)"
-msgstr "Tinklo interfeisas"
+msgstr "Tinklas (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
-msgstr ""
+msgstr "Tinklas (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
-msgstr ""
+msgstr "TinklavietÄ—s URL?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
-#, fuzzy, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+#: any.pm:248
+#, c-format
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Jungiamasi prie atvaizdžio (mirror), kad gautume prieinamų paketų sąrašą"
 
-#: any.pm:187
-#, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+#: any.pm:253
+#, c-format
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Jungiamasi prie atvaizdžio (mirror), kad gautume prieinamų paketų sąrašą"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Pasirink atvaizdį (mirror), iš kurio imti paketus"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Aplankas"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
-#, fuzzy, c-format
+#: any.pm:369
+#, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
-msgstr "Adapteris %s: %s"
+msgstr ""
 
-#: any.pm:334
-#, fuzzy, c-format
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "PagrindinÄ— laida"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nelaisvoji laida"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Tam kad veiktų laisvosios programinės įrangos tvarkyklės, kai kuri, jūsų "
+"kompiuteryje esanti, aparatinė įranga, reikalauja nelaisvosios programinės "
+"aparatinės įrangos."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Jūs turėtumėte įjungti \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Čia, jeigu norite, galite įjungti daugiau laikmenų."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
+#, c-format
 msgid "Looking at packages already installed..."
-msgstr "Tu negali atžymėti šio paketo. Jis jau yra įdiegtas"
+msgstr "Apžvelgiami jau įdiegti paketai..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Ieškoma atnaujintinų paketų"
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -172,87 +272,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
-msgstr "Klaida skaitant bylÄ… %s"
+msgstr "Klaida, skaitant failÄ… %s"
 
-#: any.pm:1020
-#, fuzzy, c-format
+#: any.pm:1304
+#, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "Ruošiamasi įdiegti šiuos paketus"
+msgstr ""
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Tinklas"
 
-#: any.pm:1102
-#, fuzzy, c-format
+#: any.pm:1386
+#, c-format
 msgid "Please choose a media"
-msgstr "Pasirinkite kitÄ… vardÄ…."
+msgstr ""
 
-#: any.pm:1118
-#, fuzzy, c-format
+#: any.pm:1402
+#, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "Jau yra tokia byla. Užrašyti ant jos?"
+msgstr ""
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Priėjimas draudžiamas"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr ""
 
-#: any.pm:1234
-#, fuzzy, c-format
+#: any.pm:1519
+#, c-format
 msgid "Cannot make screenshots before partitioning"
-msgstr "AÅ¡ daugiau negaliu pridÄ—ti nÄ— vieno skirsnio"
+msgstr ""
 
-#: any.pm:1242
-#, fuzzy, c-format
+#: any.pm:1530
+#, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "Tu gali pasirinkti kitas kalbas, kurios bus prieinamos po įdiegimo"
+msgstr ""
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
-msgstr "Įdiegiama"
+msgstr "Įdiegimas"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Nustatymai"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr ""
@@ -278,25 +378,25 @@ msgstr "Paleidžiamas tinklas"
 msgid "Bringing down the network"
 msgstr "IÅ¡jungiamas tinklas"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
-#, fuzzy, c-format
+#: media.pm:805
+#, c-format
 msgid "Copying in progress"
-msgstr "aptiktas prievade %s"
+msgstr "Kopijavimas eigoje"
 
 #: pkgs.pm:32
 #, c-format
@@ -323,269 +423,292 @@ msgstr "nuostabu"
 msgid "maybe"
 msgstr "galbūt"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Nėra aprašymo"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "Įvyko klaida"
+msgstr "Įvyko klaida:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "KitÄ… kartÄ… nebeklausti"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d įdiegimo operacijos nepavyko"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "Įdiegiamas paketas %s"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:16
+#, c-format
 msgid "Workstation"
-msgstr "KDE darbo stotis"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Biuro darbo stotis"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Biuro programos: tekstų redaktoriai (OpenOffice.org Writer, Kword), "
-"skai�iuoklės (OpenOffice.org Calc, Kspread), pdf peržiūros programos ir pan."
+"Biuro programos: tekstų redaktoriai (LibreOffice Writer, Kword), "
+"skai�iuoklės (LibreOffice Calc, Kspread), pdf peržiūros programos ir pan."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Žaidimų stotis"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 "Programos pasilinksminimui: lentos, strateginiai, kortų žaidimai ir pan."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedija stotis"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Garso ir vaizdo grojimo/redagavimo programos"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Interneto stotis"
 
-#: share/meta-task/compssUsers.pl:33
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:37
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
-"Rinkinys įrankių skaityti ir siųsti paštą bei naujienas (pine, mutt, tin) ir "
-"naršyti žiniatinklį (WWW)"
 
-#: share/meta-task/compssUsers.pl:38
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:42
+#, c-format
 msgid "Network Computer (client)"
-msgstr "Tinklo Kompiuteris, X klientas"
+msgstr "Tinklo kompiuteris (klientas)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
-msgstr ""
+msgstr "Įvairių protokolų klientai, įskaitant ssh"
 
-#: share/meta-task/compssUsers.pl:44
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:49
+#, c-format
 msgid "Tools to ease the configuration of your computer"
-msgstr "Ar tu nori išbandyti nustatymus?"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsolės įrankiai"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
-msgstr "Redaktoriai, shell'ai, bylų įrankiai, terminalai"
+msgstr "Redaktoriai, apvalkalai (shells), failų įrankiai, terminalai"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Programavimas"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
-msgstr "C bei C++ kūrimo bibliotekos, programos ir include bylos"
+msgstr "C bei C++ kūrimo bibliotekos, programos ir include failai"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Knygos ir HOWTO apie Linux ir Free Software"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:79
+#, c-format
 msgid "Web Server"
-msgstr "serveris"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Grupinis darbas"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab serveris"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Serveris, Firewall/Routeris"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
+#, c-format
 msgid "Internet gateway"
-msgstr "PriÄ—jimas prie Interneto"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:84
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:92
+#, c-format
 msgid "Mail/News"
-msgstr "/Byla/_Nauja"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:85
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:93
+#, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Serveris, Duomenų bazių"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:88
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:97
+#, c-format
 msgid "Directory Server"
-msgstr "Atstatyti iš diskelio"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP serveris"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:108
+#, c-format
 msgid "Domain Name and Network Information Server"
-msgstr "Domeno vardas"
+msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:100
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:112
+#, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Spausdinimo serveris"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:101
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:113
+#, c-format
 msgid "NFS Server, Samba server"
-msgstr "NIS serveris"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Serveris, Duomenų bazių"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
+msgid "PostgreSQL and MariaDB Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Serveris, Tinklapių/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Paštas"
 
-#: share/meta-task/compssUsers.pl:114
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:129
+#, c-format
 msgid "Postfix mail server"
-msgstr "Serveris, Duomenų bazių"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
+msgid "PostgreSQL or MariaDB database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:125
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:142
+#, c-format
 msgid "Network Computer server"
-msgstr "Serveris, Tinklo Kompiuterio serveris"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
-msgstr ""
+msgstr "GrafinÄ— aplinka"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE darbo stotis"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -594,12 +717,12 @@ msgstr ""
 "The K Desktop Environment, pagrindinÄ— grafinÄ— aplinka su dideliu rinkiniu "
 "pritaikytų programų"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome darbo stotis"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -608,69 +731,124 @@ msgstr ""
 "Grafinė aplinka su vartotojui draugiškų programų ir darbalaukio įrankių "
 "rinkiniu"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "Darbastalis"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Grafinė aplinka su vartotojui draugiškų programų ir darbalaukio įrankių "
-"rinkiniu"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Kiti grafiniai darbalaukiai"
 
-#: share/meta-task/compssUsers.pl:150
-#, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "IceWM, Window Maker, Enlightenment, Fvwm ir pan."
+#: share/meta-task/compssUsers.pl:200
+#, c-format
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "NaudÄ—s"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
+#, c-format
 msgid "SSH Server"
-msgstr "NIS serveris"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:180
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:230
+#, c-format
 msgid "Webmin"
-msgstr "įrenginys"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:181
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:231
+#, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Interneto konfigūravimas"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:185
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:235
+#, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Tinklo konfigūravimas"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:240
+#, c-format
 msgid "Mageia Wizards"
-msgstr "Prisijungti prie interneto"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:191
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:241
+#, c-format
 msgid "Wizards to configure server"
-msgstr "Nustatyti spausdintuvÄ…"
+msgstr ""
 
 #: steps.pm:85
 #, c-format
@@ -681,7 +859,7 @@ msgstr ""
 "Įvyko klaida, bet aš nežinau, kaip su ja gražiai susitvarkyti.\n"
 "Tęsk darbą savo paties rizika."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -701,333 +879,333 @@ msgstr "Įeinama į žingsnį „%s“\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux įdiegimas %s"
+msgid "%s Installation %s"
+msgstr "%s įdiegimas %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> tarp elementų"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Tavo sistemoje mažai resursų. Tu gali susidurti su bėdomis, įdiegdamas\n"
-"Mageia Linux. Jei taip atsitiktų, gali pabandyti tekstinį diegimo būdą:\n"
+"%s. Jei taip atsitiktų, gali pabandyti tekstinį diegimo būdą:\n"
 "Kai užsikrauna iš CDROM'o, paspausk `F1', o tada įvesk \"text\"."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Media Selection"
+msgstr "Laikmenos pasirinkimas"
+
+#: steps_gtk.pm:253
+#, c-format
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "IÅ¡mesti"
+msgstr ""
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "Darbastalis"
+msgstr "KDE darbalaukis"
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "Darbastalis"
+msgstr "GNOME darbalaukis"
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "Darbastalis"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
-msgstr ""
+msgstr "Štai \"%s\" darbalaukio peržiūra."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
-msgstr ""
+msgstr "Spustelėkite ant paveikslų, kad pamatytumėte didesnę peržiūrą"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Paketų grupių pasirinkimas"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Atskirų paketų pasirinkimas"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Bendras dydis: %d / %d MB"
+msgid "Unselect All"
+msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Blogas paketas"
+msgid "Total size: %d / %d MB"
+msgstr "Bendras dydis: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versija: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Dydis: "
 
-#: steps_gtk.pm:406
-#, fuzzy, c-format
+#: steps_gtk.pm:422
+#, c-format
 msgid "%d KB\n"
-msgstr "Dydis: %d KB\n"
+msgstr ""
 
-#: steps_gtk.pm:407
-#, fuzzy, c-format
+#: steps_gtk.pm:423
+#, c-format
 msgid "Importance: "
-msgstr "Svarba: %s\n"
+msgstr ""
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Tu negali pažymėti/atžymėti šio paketo"
 
-#: steps_gtk.pm:445
-#, fuzzy, c-format
+#: steps_gtk.pm:462
+#, c-format
 msgid "due to missing %s"
-msgstr "nieko"
+msgstr "dėl trūkstamo %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "dÄ—l nepatenkinto %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "bandau paaukštinti %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s išlaikymui"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Tu negali pasirinkti šio paketo, kadangi nebėra pakankamai vietos jam įdiegti"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Ruošiamasi įdiegti šiuos paketus"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Ruošiamasi pašalinti šiuos paketus"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Tai yra privalomas paketas, jis negali būti atžymėtas"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Tu negali atžymėti šio paketo. Jis jau yra įdiegtas"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Tu negali atžymėti šio paketo. Jis privalo būti atnaujintas"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Įdiegti"
 
-#: steps_gtk.pm:499
-#, fuzzy, c-format
+#: steps_gtk.pm:515
+#, c-format
 msgid "Load/Save selection"
-msgstr "Išsaugoti pažymėjimą"
+msgstr ""
 
-#: steps_gtk.pm:500
-#, fuzzy, c-format
+#: steps_gtk.pm:516
+#, c-format
 msgid "Updating package selection"
-msgstr "Išsaugoti paketų pasirinkimą"
+msgstr ""
 
-#: steps_gtk.pm:505
-#, fuzzy, c-format
+#: steps_gtk.pm:521
+#, c-format
 msgid "Minimal install"
-msgstr "IÅ¡mesti"
+msgstr ""
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Programinės įrangos tvarkyklė"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Pasirink paketus, kuriuos tu nori įdiegti"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Įdiegiama"
 
-#: steps_gtk.pm:565
-#, fuzzy, c-format
+#: steps_gtk.pm:581
+#, c-format
 msgid "No details"
-msgstr "DetalÄ—s"
+msgstr ""
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "Liko laiko "
+msgstr "Liko laiko:"
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "Skai�iuojama"
+msgstr "(apskai�iuojama...)"
 
-#: steps_gtk.pm:615
-#, fuzzy, c-format
+#: steps_gtk.pm:631
+#, c-format
 msgid "%d package"
 msgid_plural "%d packages"
-msgstr[0] "%d paketų"
-msgstr[1] "%d paketų"
-msgstr[2] "%d paketų"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Apibendrinimas"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Nustatyti"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
-#, fuzzy, c-format
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
+#, c-format
 msgid "not configured"
-msgstr "iš naujo nustatyti"
-
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Paketų grupių pasirinkimas"
+msgstr ""
 
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Įvyko klaida"
 
-#: steps_interactive.pm:104
-#, fuzzy, c-format
+#: steps_interactive.pm:105
+#, c-format
 msgid "Please choose your keyboard layout"
-msgstr "Prašom pasirinkti klaviatūros išdėstymą"
+msgstr "Prašome pasirinkti savo klaviatūros išdėstymą"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "Čia yra galimų klaviatūrų sąrašas"
+msgstr ""
 
-#: steps_interactive.pm:146
-#, fuzzy, c-format
+#: steps_interactive.pm:153
+#, c-format
 msgid "Install/Upgrade"
-msgstr "Įdiegti/Atnaujinti"
+msgstr ""
 
-#: steps_interactive.pm:150
-#, fuzzy, c-format
+#: steps_interactive.pm:157
+#, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "Ar tai įdiegimas, ar atnaujinimas?"
+msgstr ""
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Įdiegti"
 
-#: steps_interactive.pm:154
-#, fuzzy, c-format
+#: steps_interactive.pm:161
+#, c-format
 msgid "Upgrade %s"
-msgstr "Atnaujinimas"
+msgstr ""
 
-#: steps_interactive.pm:172
-#, fuzzy, c-format
+#: steps_interactive.pm:184
+#, c-format
 msgid "Encryption key for %s"
-msgstr "Slaptažodžiai nesutampa"
+msgstr ""
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "Įdiegiama"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1036,32 +1214,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Nustatome IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1069,163 +1232,191 @@ msgid ""
 "done.\n"
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
-"Pakeisk CD!\n"
+"Pakeiskite CD!\n"
 "\n"
-"Prašom įkišti CD su užrašu „%s“ į kaupiklį, tada paspausk Gerai.\n"
-"Jei tu jo neturi, spausk Nutraukti, kad išvengtum įdiegimo iš šio CD."
+"Prašome įkišti CD su užrašu „%s“ į kaupiklį, tada paspausti Gerai.\n"
+"Jei jūs jo neturite, spauskite Nutraukti, kad išvengtumėte įdiegimo iš šio "
+"CD."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Ieškomi galimi paketai"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Įkelti"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "IÅ¡saugoti"
 
-#: steps_interactive.pm:453
-#, fuzzy, c-format
+#: steps_interactive.pm:438
+#, c-format
 msgid "Bad file"
-msgstr "Įkelti bylą"
+msgstr ""
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "Paketų grupių pasirinkimas"
+msgstr "Darbalaukio pasirinkimas"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
-msgstr ""
+msgstr "Galite pasirinkti savo kompiuterio darbalaukio profilį."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
-#, fuzzy, c-format
+#: steps_interactive.pm:572
+#, c-format
 msgid "Type of install"
-msgstr "Pasirink paketą įdiegimui"
+msgstr ""
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
-#, fuzzy, c-format
+#: steps_interactive.pm:578
+#, c-format
 msgid "With X"
-msgstr "Palauk"
+msgstr ""
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Įdiegiamas paketas %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Ruošiamas įdiegimas"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Įdiegiamas paketas %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Įvyko klaida, bandant sutvarkyti paketus:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Vis tiek tęsti?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
-#, fuzzy, c-format
+#: steps_interactive.pm:682
+#, c-format
 msgid "Go back to media and packages selection"
-msgstr "Išsaugoti paketų pasirinkimą"
+msgstr ""
 
-#: steps_interactive.pm:683
-#, fuzzy, c-format
+#: steps_interactive.pm:685
+#, c-format
 msgid "There was an error installing package %s."
-msgstr "Įvyko klaida, įdiegiant paketus:"
+msgstr ""
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Konfigūracija po įdiegimo"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Atnaujinimai"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Dabar jūs turite galimybę nusistatyti internetinę laikmeną."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Tai leidžia įdiegti saugumo atnaujinimus."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Kad nusistatytumėte laikmenas, jums reikės veikian�io interneto ryšio\n"
+"\n"
+"Ar norite nustatyti atnaujinimų laikmeną?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1238,121 +1429,114 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s iš %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
-msgstr "Geležis"
+msgstr "Aparatinė įranga"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
-#, fuzzy, c-format
+#: steps_interactive.pm:909 steps_interactive.pm:926
+#, c-format
 msgid "Sound card"
-msgstr "StandartinÄ—"
+msgstr ""
 
-#: steps_interactive.pm:919
-#, fuzzy, c-format
+#: steps_interactive.pm:929
+#, c-format
 msgid "Do you have an ISA sound card?"
-msgstr "Ar turi dar vienÄ…?"
+msgstr ""
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:931
-#, fuzzy, c-format
+#: steps_interactive.pm:941
+#, c-format
 msgid "Graphical interface"
-msgstr "X paleidžiant"
+msgstr ""
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Tinklas & Internetas"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "TarpinÄ—s stotys (proxies)"
 
-#: steps_interactive.pm:950
-#, fuzzy, c-format
+#: steps_interactive.pm:961
+#, c-format
 msgid "configured"
-msgstr "iš naujo nustatyti"
+msgstr ""
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Saugumo lygis"
 
-#: steps_interactive.pm:979
-#, fuzzy, c-format
+#: steps_interactive.pm:991
+#, c-format
 msgid "Firewall"
-msgstr "Serveris, Firewall/Routeris"
+msgstr "Užkarda"
 
-#: steps_interactive.pm:983
-#, fuzzy, c-format
+#: steps_interactive.pm:995
+#, c-format
 msgid "activated"
-msgstr "Aktyvus"
+msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "uždraustas"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Ruošiama įkrovos tvarkyklė"
+msgid "Preparing initial startup program..."
+msgstr "Ruošiama pradinės paleisties programa..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
-msgstr ""
+msgstr "Būkite kantrūs, tai gali šiek tiek užtrukti..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Įdėk tuš�ią diskelį į kaupiklį %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Kuriamas automatinio įdiegimo diskelis"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1363,15 +1547,15 @@ msgstr ""
 "\n"
 "Ar tu nori išeiti dabar?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Sveikinimai"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
-msgstr "Perkrauti"
+msgstr "Paleisti iš naujo"
 
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
@@ -1384,7 +1568,7 @@ msgstr "Pasirink savo kalbÄ…"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "Localizacija"
 
 #: steps_list.pm:17
 #, c-format
@@ -1463,13 +1647,6 @@ msgid ""
 "Users"
 msgstr "Vartotojai"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Tinklai"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1511,112 +1688,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "IÅ¡eiti"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Biuro programos: tekstų redaktoriai (kword, abiword), skai�iuoklės "
-#~ "(kspread, gnumeric), pdf peržiūros programos ir pan."
-
-#, fuzzy
-#~ msgid "Downloading file %s..."
-#~ msgstr "Išsaugoti į bylą"
-
-#, fuzzy
-#~ msgid "IceWm Desktop"
-#~ msgstr "Darbastalis"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr ""
-#~ "Jungiamasi prie atvaizdžio (mirror), kad gautume prieinamų paketų sąrašą"
-
-#, fuzzy
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Uždrausti tinklą"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Sukurti automatinio įdiegimo diskelį"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "Automatinis įdiegimas reikalui esant gali būti pilnai\n"
-#~ "automatizuotas. Tokiu atveju jis užims visą diską!!\n"
-#~ "(turint omenyje įdiegimą į kitą dėžę).\n"
-#~ "\n"
-#~ "Jūs galbūt norėsite pakartoti įdiegimą.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Parodyti vÄ—l"
-
-#~ msgid "Automated"
-#~ msgstr "Automatinis"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Išsaugoti paketų pasirinkimą"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Ar nori naudoti aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Klaida įdiegiant aboot,\n"
-#~ "bandyti įdiegti priverstinai, net jei tai sunaikintų pirmąjį skirsnį?"
-
-#~ msgid "All"
-#~ msgstr "Visos"
-
-#~ msgid "TV card"
-#~ msgstr "TV plokštė"
-
-#~ msgid "Boot"
-#~ msgstr "Įkelties nustatymai"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Autentikacija"
-
-#, fuzzy
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "%d paketų"
-#~ msgstr[1] "%d paketų"
-#~ msgstr[2] "%d paketų"
-
-#~ msgid "%d packages"
-#~ msgstr "%d paketų"
-
-#~ msgid "Language"
-#~ msgstr "Pasirink savo kalbÄ…"
-
-#~ msgid "License"
-#~ msgstr "Licencija"
-
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "Parink įdiegimo klasę"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "Skai�iuojama"
-
-#, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "Pasirinkti paketus"
-
-#~ msgid "Users"
-#~ msgstr "Vartotojai"
-
-#~ msgid "Networking"
-#~ msgstr "Tinklai"
-
-#~ msgid "Configure X"
-#~ msgstr "Nustatyti X"
diff --git a/perl-install/install/share/po/ltg.po b/perl-install/install/share/po/ltg.po
index 9d14bb42f..8e1479b15 100644
--- a/perl-install/install/share/po/ltg.po
+++ b/perl-install/install/share/po/ltg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2006-09-24 17:51+0200\n"
 "Last-Translator: M�ris Laureckis <marlau@inbox.lv>\n"
 "Language-Team: Latgalian <linux@latgola.lv>\n"
@@ -15,38 +15,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Biroja dators"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "For developers!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Thank you!"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Voi jiusim ir papyldus datu nesiejs?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -60,93 +85,89 @@ msgstr ""
 "\n"
 "Voi jiusim ir papyldus datu nesieji deļ uzstuodeišonys?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Teiklys (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Teiklys (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Teiklys (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Voi spūguļservera URL?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL juosasuoc ar ftp:// voi http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Pīsasl�dzu Mageia Linux teimekļam, lai sajimtu pīejamū spūguļserveru "
-"sarokstu..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Pīsasl�dzu %s teimekļam, lai sajimtu pīejamū spūguļserveru sarokstu..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Dasasliegšona Mageia Linux teimekļam cīta naveiksmi, lai sajimtu pīejamū "
-"spūguļserveru sarokstu"
+"Dasasliegšona %s teimekļam cīta naveiksmi, lai sajimtu pīejamū spūguļserveru "
+"sarokstu"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Izavielejit spūguļserveri, nu kura jimt pakūtnis"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS uzstuodeišona"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Lyudzu, Ä«vodit hosta vuordu i jiusu NFS datu nesieja katalogu"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Kaids ir NFS monteišonys hosta vuords?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Katalogs"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -155,23 +176,90 @@ msgstr ""
 "Iz ituo spūguļservera navar atrast pakūtņu saroksta failu. Puorbaudit, voi "
 "atsarūn pareiz� vīt�."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Mekleju jau īprīkš uzinstaleituos pakūtnis..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Mekleju uzlobuojamuos pakūtnis"
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Teik nūdz�stys pakūtnis pyrms atjaunynuošonys..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -184,87 +272,87 @@ msgstr ""
 "\n"
 "Voi teišom gribit nūjimt ituos pakūtnis?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Kliuda, nūlosūt failu %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Sekojūši diski tika puorsaukti:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (īprīkš tika saukta kai %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Teiklys"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Lyudzu, izavielejit datu nesieju"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fails jau eksistej. Voi puorrakstēt pa viersu?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Pīeja līgta"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Naveiksmeigs NFS vuords"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Napareizs datu nesiejs %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Navar izveiduot ekrana att�lus pyrms sadaļu izveidis"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekrana att�li byus pīejami piec instaleišonys %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalaceja"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfiguraceja"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Jiusim ir juoformatej ari %s"
@@ -288,22 +376,22 @@ msgstr "Īdorbynoju teiklu"
 msgid "Bringing down the network"
 msgstr "Atsl�dzu teiklu"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Teik kop�tys dažys pakūtnis lītuošonai nuokūtnē"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Nūteik kopeišona"
@@ -333,73 +421,98 @@ msgstr "v�lams"
 msgid "maybe"
 msgstr "varbyut"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Nav aproksta"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Atkluota kliuda"
 
-#: pkgs.pm:814
-#, fuzzy, c-format
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "NÅ«tikuse fatala kliuda: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
+#, c-format
 msgid "%d installation transactions failed"
-msgstr "Instalaceja naizadeve"
+msgstr "%d instalacejis transakcejis naizadeve"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instaleju pakūtni %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Dorba staceja"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Biroja dators"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Biroja programmys: teksta procesori (OpenOffice.org Writer, Kword), "
-"izkluojlopys (OpenOffice.org Calc, Kspread), PDF skateituoji, u.c."
+"Biroja programmys: teksta procesori (LibreOffice Writer, Kword), "
+"izkluojlopys (LibreOffice Calc, Kspread), PDF skateituoji, u.c."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Spēļu dators"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Izklaidis programmys: arkade, goldaspēlis, strategeja u.c."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedeju dators"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Skanis i video atskaņuošonys/redigeišonys programmys"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Interneta dators"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -408,193 +521,193 @@ msgstr ""
 "Reiku komplekts, lai laseitu i syuteitu postu voi jaunumus (mutt, tin..), i "
 "puorlyukuotu Puorstaipteiklu"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Teikla dators (klients)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienti dažaidim protokolim, īskaitūt ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Reiki datora konfigureišonys atvīgluošonai"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsolis reiki"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktori, �aulys, failu reiki, terminali"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Izstruode"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C i C++ izstruodis bibliotekys, programmys i īkļautī faili"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentaceja"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Gruomotys i vaicuojumu par Linux i Breivū programmaturu"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linuks Standarta B�ze. Trešū izstruoduoju aplikaceju atbolsts"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Puorstaipteikla (Web) servers"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab servers"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Gunsmyurs/Maršrutizators"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Interneta vuorteja"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Posts/Jauns"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix posta servers, Inn ziņu servers"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Katalogu Servers"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP servers"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "DNS i NIS servers"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Failu un Printeru Kūplītuošonys servers"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS servers, Samba servers"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Datub�zis"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL i MySQL datub�žu servers"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL i MariaDB datub�žu servers"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Teimeklis/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Posts"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix posta servers"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL voi MySQL datub�žu servers"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL voi MariaDB datub�žu servers"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Teikla datoru servers"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS servers, SMB servers, storpnīkservers (Proxy), ssh servers"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafiskuo vide"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE dorba staceja"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -603,12 +716,12 @@ msgstr ""
 "K Desktop Environment, golvonuo grafiskuo vide kūp� ar papyldus reiku "
 "kolekceju"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome dorba staceja"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -617,66 +730,129 @@ msgstr ""
 "Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba "
 "viersmys reikim"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE dorba staceja"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba "
+"viersmys reikim"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Gnome dorba staceja"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Dorba staceja"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Grafiskuo vide"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "IceWm Dorba viersma"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba "
+"viersmys reikim"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "IceWm Dorba viersma"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba "
 "viersmys reikim"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "IceWm Dorba viersma"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"K Desktop Environment, golvonuo grafiskuo vide kūp� ar papyldus reiku "
+"kolekceju"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Cytys grafiskuos dorba viersmys"
 
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:200
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm u.c."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilitys"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH servers"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin attuolynuotuos konfiguracejis servers "
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Teikla utilitys/puorraudzeiba"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Puorraudzeibys reiki, procesu uzskaite, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia paleigi"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Servera konfiguracejis paleigi"
@@ -690,7 +866,7 @@ msgstr ""
 "Nūtyka klaida, bet es nazynu, kai tū korekti apstruoduot.\n"
 "Turpynuot iz jiusu poša riska."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -710,253 +886,253 @@ msgstr "Teik uzsuokts sūļs `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux instaleišona %s"
+msgid "%s Installation %s"
+msgstr "%s instaleišona %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> puorīt"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Jiusu sistemai tryukst resursu. Mageia Linux instaleišonys laik� var\n"
+"Jiusu sistemai tryukst resursu. %s instaleišonys laik� var\n"
 "rastīs problemys. Ja tai nūteik, varit pamieginuot teksta režima "
 "instaleišonu. Lai tū izdareitu,\n"
 "nūspīdit`F1', kod nūteik īluode nu CDROM, tod īvodit `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Pakūtņu grupu izviele"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Minimala instaleišona"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "IceWm Dorba viersma"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "IceWm Dorba viersma"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "IceWm Dorba viersma"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakūtņu grupu izviele"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Atsevišku pakūtņu izviele"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Kūpejais izm�rs: %d / %d MB"
+msgid "Unselect All"
+msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Slykta pakūtne"
+msgid "Total size: %d / %d MB"
+msgstr "Kūpejais izm�rs: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Verseja: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Izm�rs: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Svareigums: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Jius varit izavielēt/atsateikt nu ituos pakūtnis"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "tryukuma dieļ %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "deļ naapmīrynuojuma %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "teik mieginuots aktivizēt %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "lai saglobuot %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Jius navarit izavielēt itū pakūtni, par tū ka napīteik vītys tuos "
 "instaleišonai"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Tiks instaleitys sekojūšys pakūtnis"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Tiks nūjimtys sekojūšys pakūtnis"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Itei ir obligata pakūtne, nu tuos navar atsateikt"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Jius navarit atsateikt nu ituos pakūtnis. Tei jau ir instaleita"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Jius navarit atsateikt nu ituos pakūtnis. Tū ir napīcīšoms uzlobuot"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Paruodeit automatiski izv�l�tuos pakūtnis"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalēt"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Īluodēt/Saglobuot izviele"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Teik atjaunynuota pakūtņu izviele"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimala instaleišona"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Programmaturys puorvaļdeišona"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Izavielejit pakūtnis, kū gribit instalēt"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Teik instaleits"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Nav detaļu"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Atlykušais laiks"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Aptuvenais nūviertiejums"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakūtnis"
 msgstr[1] "%d pakūtnis"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "KÅ«psavylkums"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Konfigurēt"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "nav konfigur�ts"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Pakūtņu grupu izviele"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -965,12 +1141,12 @@ msgstr ""
 "Atrosti sekojūši instalacejis datu nesieji.\n"
 "Ja jius gribit izlaist dažus nu tim, jius tagad varit nūjimt atzeimi nu tim."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Jiusim ir opceja, pyrms instalacejis nūkopēt kompaktdiska saturu uz cītu "
@@ -978,72 +1154,72 @@ msgstr ""
 "Taid� veid� turpynuosīs nu cītuo diska un pakūtnis byus pīejamys cikom "
 "sistema tiks piļneib� uzinstaleita."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopēt vysu kompaktdisku"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Atkluota kliuda"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Lyudzu izavielejit jiusu klaviaturys izkuortuojumu"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Ite ir pylns pīejamū klaviaturu saroksts"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalēt/Atjaunynuot"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Itei ir instaleišona voi atjaunynuošona?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalēt"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Atjaunynuot %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Šifreišonys atsl�ga deļ %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Instalaceja"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1052,38 +1228,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Teik konfigur�ts IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Nav 1MB breivys vītys suokneišonys programmai! Instaleišona turpynuosīs, bet "
-"lai īluod�tu sistemu, jiusim vajadzēs izveiduot suokneišonys programmys "
-"diska sadali programm� DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Jiusim vajadzēs izveiduot PPC PReP Boot suokneišonys programmu! Instaleišona "
-"turpynuosīs, bet lai īluod�tu sistemu, jiusim vajadzēs izveiduot "
-"suokneišonys programmys diska sadali programm� DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1097,19 +1252,19 @@ msgstr ""
 "Ja jiusim nav ituo diska, nūspīdit Atceļt, lai nainstaleitu nu ituo "
 "kompaktdiska."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Mekleju pīejamuos pakūtnis"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1118,52 +1273,52 @@ msgstr ""
 "Lyudzu izavielejit īluodēt voi saglobuot pakūtņu izvieli.\n"
 "Formats ir taids pats, kai ar auto_install gener�tom failim."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Īluodēt"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Saglobuot"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Napareizs fails"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
-msgstr ""
+msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Pakūtņu grupu izviele"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Izv�l�tais apjūms ir leluoks nakai pīejamuo vīta"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Instalacejis tips"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1172,87 +1327,111 @@ msgstr ""
 "Jius naizavielēt nivīnu pakūtņu grupu.\n"
 "Lyudzu, izavielejit minimalū instalaceju, kaidu jius gribit:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Ar X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Instaleju pakūtni %s"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Ar pamatdokumentaceju (Ä«teicams!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Patīši minimala instalaceja (īpaši bez urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Sagataveju suokneituoju"
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Sagataveju instaleišonu"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instaleju pakūtni %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Pakūtņu kuortuošonys laik� atkluota kliuda:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Tūm�r turpynuot?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Atjaunuot"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Saglobuot pakūtņu izvieli"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Pakūtņu instaleišonys laik� atkluota kliuda:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Piecinstaleišonys konfigureišona"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Lyudzu, puorsalīcynojit ka Update Modules atsarū īkuort� %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Atjaunynuojumi"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1274,28 +1453,29 @@ msgstr ""
 "\n"
 "Voi jius gribit instalēt atjaunynuojumus?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s iz %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Aparatura"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Skanis karte"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Vai jiusim ir ISA skanis karte?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1304,82 +1484,70 @@ msgstr ""
 "Piec instaleišonys palaidit \"alsaconf\" voi \"sndconfig\", lai konfigur�tu "
 "jiusu skanis karti"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Nav atrosta skanis karte. Piec instaleišonys izmieginit \"harddrake\""
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafiskuo saskarne"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Teiklys & Internets"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Storpnīkserveri"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "konfigur�ts"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Drūšeibys leimiņs"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Guņsmyurs"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktiviz�ts"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "atsl�gts"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Jiusim nav nūkonfigur�ts X servers. Voi jius asot puorlīcynuoti, ka jius tū "
 "gribit?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Sagataveju suokneituoju"
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Sagataveju instaleišonu"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Izaver, ka jiusim ir vaca voi nazynomys izceļsmis dators, yaboot "
-"suokneituojs nastruoduos. Instaleišona turpynuosīs, bet jiusim byus "
-"juoizmontoj BootX voi kas cyts, lai īluod�tu datoru. Kūdula arguments deļ "
-"root fs ir: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1388,17 +1556,17 @@ msgstr ""
 "Šym� drūšeibys leiminī, pīeeja Windows sadalis failim ir tikai "
 "administratoram."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Īlicit tukšu disketi īkuort� %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Sagataveju auto instaleišonys disketi"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1409,12 +1577,12 @@ msgstr ""
 "\n"
 "Voi tīšom gribit izīt tagad?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Apsveicam"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Puorsuoknēt"
@@ -1430,7 +1598,7 @@ msgstr "Volūdys izviele"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "Lokaliziešona"
 
 #: steps_list.pm:17
 #, c-format
@@ -1509,13 +1677,6 @@ msgid ""
 "Users"
 msgstr "LÄ«tuotuoji"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Teikluošona"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1558,6 +1719,67 @@ msgid ""
 "Exit"
 msgstr "Izīt"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Sagataveju suokneituoju"
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba "
+#~ "viersmys reikim"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "IceWm Dorba viersma"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "Nav 1MB breivys vītys suokneišonys programmai! Instaleišona turpynuosīs, "
+#~ "bet lai īluod�tu sistemu, jiusim vajadzēs izveiduot suokneišonys "
+#~ "programmys diska sadali programm� DiskDrake"
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "Jiusim vajadzēs izveiduot PPC PReP Boot suokneišonys programmu! "
+#~ "Instaleišona turpynuosīs, bet lai īluod�tu sistemu, jiusim vajadzēs "
+#~ "izveiduot suokneišonys programmys diska sadali programm� DiskDrake"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Izaver, ka jiusim ir vaca voi nazynomys izceļsmis dators, yaboot "
+#~ "suokneituojs nastruoduos. Instaleišona turpynuosīs, bet jiusim byus "
+#~ "juoizmontoj BootX voi kas cyts, lai īluod�tu datoru. Kūdula arguments deļ "
+#~ "root fs ir: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Laipni lyugtum"
+
+#~ msgid "Select All"
+#~ msgstr "Izavielēt vysys"
+
+#~ msgid "Bad package"
+#~ msgstr "Slykta pakūtne"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Sagataveju suokneituoju"
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Teikluošona"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1607,7 +1829,7 @@ msgstr "Izīt"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/lv.po b/perl-install/install/share/po/lv.po
index 315c9e845..bcc753fbf 100644
--- a/perl-install/install/share/po/lv.po
+++ b/perl-install/install/share/po/lv.po
@@ -1,15 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandriva.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2002-09-27 17:45+0200\n"
-"Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
-"Language-Team: Latvian <ll10nt@listes.murds.lv>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 04:07+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Latvian (http://www.transifex.com/MageiaLinux/mageia/language/"
+"lv/)\n"
 "Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +19,63 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
-#, fuzzy, c-format
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
+#, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Vai ir vēl k�ds?"
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -57,116 +84,179 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
-#, fuzzy, c-format
+#: any.pm:163
+#, c-format
 msgid "Network (HTTP)"
-msgstr "TÄ«kls"
+msgstr ""
 
-#: any.pm:122
-#, fuzzy, c-format
+#: any.pm:164
+#, c-format
 msgid "Network (FTP)"
-msgstr "TÄ«kls"
+msgstr ""
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Pieslēdzos Mageia Linux tīmeklim, lai saņemtu pieejamo spoguļserveru "
-"sarakstu sarakstu..."
+"Pieslēdzos %s tīmeklim, lai saņemtu pieejamo spoguļserveru sarakstu "
+"sarakstu..."
 
-#: any.pm:187
-#, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+#: any.pm:253
+#, c-format
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Pieslēdzos Mageia Linux tīmeklim, lai saņemtu pieejamo spoguļserveru "
-"sarakstu sarakstu..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Izvēlieties spoguļserveri, no kura ņemt pakotnes"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Katalogs"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
-#, fuzzy, c-format
+#: any.pm:369
+#, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
-msgstr "Nevar atrast %s uz %s"
+msgstr ""
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Meklēju jau iepriekš uzinstalēt�s pakotnes..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Meklēju uzlabojam�s pakotnes"
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -179,87 +269,87 @@ msgstr ""
 "\n"
 "Vai tieš�m vēlaties noņemt šīs pakotnes?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Kļūda, nolasot failu %s"
 
-#: any.pm:1020
-#, fuzzy, c-format
+#: any.pm:1304
+#, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "Tiks instalētas sekojošas pakotnes"
+msgstr ""
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "TÄ«kls"
 
-#: any.pm:1102
-#, fuzzy, c-format
+#: any.pm:1386
+#, c-format
 msgid "Please choose a media"
-msgstr "Lūdzu izvēlieties"
+msgstr ""
 
-#: any.pm:1118
-#, fuzzy, c-format
+#: any.pm:1402
+#, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "Fails jau eksistē. P�rrakstīt?"
+msgstr ""
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Pieeja liegta"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
-#, fuzzy, c-format
+#: any.pm:1475
+#, c-format
 msgid "Bad media %s"
-msgstr "pievienoju datu nesēju %s."
+msgstr ""
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Nevar izveidot ekr�na attēlus pirms sadaļu izveides"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekr�na attēli būs pieejami pēc instalēšanas %s."
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
-msgstr "Instalēju"
+msgstr ""
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfigur�cija"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Jums ir j�formatē arī %s"
@@ -283,25 +373,25 @@ msgstr "Iedarbinu tīklu"
 msgid "Bringing down the network"
 msgstr "Atslēdzu tīklu"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
-#, fuzzy, c-format
+#: media.pm:805
+#, c-format
 msgid "Copying in progress"
-msgstr "Notiek noteikšana"
+msgstr ""
 
 #: pkgs.pm:32
 #, c-format
@@ -328,268 +418,291 @@ msgstr "derīga"
 msgid "maybe"
 msgstr "varbūt"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr ""
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "Atkl�ta kļūda"
+msgstr ""
+
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
 
-#: pkgs.pm:814
-#, fuzzy, c-format
+#: pkgs.pm:911
+#, c-format
 msgid "%d installation transactions failed"
-msgstr "Instalēšana neizdev�s"
+msgstr ""
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "Instalēju pakotni %s"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Darbastacija"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Biroja dators"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Biroja programmas: teksta procesori (OpenOffice.org Writer, Kword), "
-"izkl�jlapas (OpenOffice.org Calc, Kspread), pdf skatīt�ji, u.c."
+"Biroja programmas: teksta procesori (LibreOffice Writer, Kword), izkl�jlapas "
+"(LibreOffice Calc, Kspread), pdf skatīt�ji, u.c."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Spēļu dators"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Izklaides programmas: ark�de, galdiņspēles, stratēģija u.c."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimēdiju dators"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Skaņas un video atskaņošanas/rediģēšanas programmas"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Interneta dators"
 
-#: share/meta-task/compssUsers.pl:33
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:37
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
-"Rīku komplekts, lai lasītu un sūtītu pastu vai jaunumus (pine, mutt, tin..) "
-"un p�rlūkotu Tīmekli"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "TÄ«kla dators (klients)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienti daž�diem protokoliem, ieskaitot ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Rīki datora konfigurēšanas atvieglošanai"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsoles rīki"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktori, �aulas, failu rīki, termin�ļi"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Izstr�de"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C un C++ izstr�des bibliotēkas, programmas un include faili"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokument�cija"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Gr�matas un Howto faili par Linux un Brīvo programmatūru"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Web serveris"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:84
+#, c-format
 msgid "Groupware"
-msgstr "grupa"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab serveris"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Ugunsmūris/Maršrutizators"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Interneta v�rteja"
 
-#: share/meta-task/compssUsers.pl:84
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:92
+#, c-format
 msgid "Mail/News"
-msgstr "/Fails/_Jauns"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:85
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:93
+#, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Postfix pasta serveris"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:88
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:97
+#, c-format
 msgid "Directory Server"
-msgstr "Atjanot no CD"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP serveris"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:108
+#, c-format
 msgid "Domain Name and Network Information Server"
-msgstr "Domēna nosaukumu serveris"
+msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:100
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:112
+#, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Printera serveris"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:101
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:113
+#, c-format
 msgid "NFS Server, Samba server"
-msgstr "Samba serveris"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Datub�zes"
 
-#: share/meta-task/compssUsers.pl:105
-#, fuzzy, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL vai MySQL datub�zu serveris"
+#: share/meta-task/compssUsers.pl:118
+#, c-format
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "TÄ«meklis/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Pasts"
 
-#: share/meta-task/compssUsers.pl:114
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:129
+#, c-format
 msgid "Postfix mail server"
-msgstr "Postfix pasta serveris"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL vai MySQL datub�zu serveris"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL vai MariaDB datub�zu serveris"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "TÄ«kla datoru serveris"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS serveris, SMB serveris, Proxy serveris, ssh serveris"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafisk� vide"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE darbastacija"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -597,12 +710,12 @@ msgid ""
 msgstr ""
 "K Desktop Environment, galven� grafisk� vide kop� ar papildus rīku kolekciju"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome darbastacija"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -611,69 +724,124 @@ msgstr ""
 "Grafisk� vide ar lietot�jiem draudzīgu programmu komplektu un darbavirsmas "
 "rīkiem"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "Darbavirsma"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Grafisk� vide ar lietot�jiem draudzīgu programmu komplektu un darbavirsmas "
-"rīkiem"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Citas grafisk�s darbavirsmas"
 
-#: share/meta-task/compssUsers.pl:150
-#, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm u.c."
+#: share/meta-task/compssUsers.pl:200
+#, c-format
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilites"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH serveris"
 
-#: share/meta-task/compssUsers.pl:180
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:230
+#, c-format
 msgid "Webmin"
-msgstr "Webmin serviss"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:181
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:231
+#, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Mageia termin�ļu servera konfigur�cija"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:185
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:235
+#, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Tīkla konfigur�cija"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:240
+#, c-format
 msgid "Mageia Wizards"
-msgstr "Mageia Linux kontroles centrs"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:191
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:241
+#, c-format
 msgid "Wizards to configure server"
-msgstr "Konfigurēju printeri \"%s\"..."
+msgstr ""
 
 #: steps.pm:85
 #, c-format
@@ -684,7 +852,7 @@ msgstr ""
 "Atkl�ta kļūda, bet es nezinu, k� ar to pareizi apieties.\n"
 "Turpiniet, ja vēlaties riskēt."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -704,334 +872,334 @@ msgstr "Uzs�ku soli `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux instalēšana %s"
+msgid "%s Installation %s"
+msgstr "%s instalēšana %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> p�riet"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Jūsu sistēmai trūkst resursu. Mageia Linux instalēšanas laik� var\n"
+"Jūsu sistēmai trūkst resursu. %s instalēšanas laik� var\n"
 "rasties problēmas. Ja t� notiek, varat pamēģin�t teksta instalēšanu.\n"
 "Lai to izdarītu, nospiediet`F1', ka notiek iel�de no CDROM, tad ievadiet\n"
 "`text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Media Selection"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr ""
+
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "Minim�la instalēšana"
+msgstr ""
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "Darbavirsma"
+msgstr ""
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "Darbavirsma"
+msgstr ""
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "Darbavirsma"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakotņu grupu izvēle"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Atsevišķu pakotņu izvēle"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Kopējais izmērs: %d / %d MB"
+msgid "Unselect All"
+msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Slikta pakotne"
+msgid "Total size: %d / %d MB"
+msgstr "Kopējais izmērs: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versija: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Apjoms: "
 
-#: steps_gtk.pm:406
-#, fuzzy, c-format
+#: steps_gtk.pm:422
+#, c-format
 msgid "%d KB\n"
-msgstr "Apjoms: %d KB\n"
+msgstr ""
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Svarīgums: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Jūs varat izvēlēties/atteikties no šīs pakotnes"
 
-#: steps_gtk.pm:445
-#, fuzzy, c-format
+#: steps_gtk.pm:462
+#, c-format
 msgid "due to missing %s"
-msgstr "trūkstošs kdesu"
+msgstr ""
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Jūs nevarat izvēlēties šo pakotni, jo nepietiek vietas t�s instalēšanai"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Tiks instalētas sekojošas pakotnes"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Tiks noņemtas sekojošas pakotnes"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Šī ir oblig�ta pakotne, no t�s nevar atteikties"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Jūs nevarat atteikties no šīs pakotnes. T� jau ir instalēta"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Jūs nevarat atteikties no šīs pakotnes. To ir nepieciešams uzlabot"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Par�dīt autom�tiski izvēlēt�s pakotnes"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalēt"
 
-#: steps_gtk.pm:499
-#, fuzzy, c-format
+#: steps_gtk.pm:515
+#, c-format
 msgid "Load/Save selection"
-msgstr "Saglab�t iezīmēto"
+msgstr ""
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Atjaunoju pakotņu izvēli"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minim�la instalēšana"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Software Management"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Izvēlieties pakotnes, ko vēlaties instalēt"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalēju"
 
-#: steps_gtk.pm:565
-#, fuzzy, c-format
+#: steps_gtk.pm:581
+#, c-format
 msgid "No details"
-msgstr "Detaļas"
+msgstr ""
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "Atlikušais laiks"
+msgstr ""
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "Aprēķinu"
+msgstr ""
 
-#: steps_gtk.pm:615
-#, fuzzy, c-format
+#: steps_gtk.pm:631
+#, c-format
 msgid "%d package"
 msgid_plural "%d packages"
-msgstr[0] "%d pakotnes"
-msgstr[1] "%d pakotnes"
-msgstr[2] "%d pakotnes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Kopsavilkums"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Konfigurēt"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
-#, fuzzy, c-format
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
+#, c-format
 msgid "not configured"
-msgstr "p�rkonfigurēt"
-
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Pakotņu grupu izvēle"
+msgstr ""
 
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Atkl�ta kļūda"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Lūdzu izvēlieties jūsu tastatūras izk�rtojumu"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "Šeit ir pilns pieejamo tastatūru saraksts"
+msgstr ""
 
-#: steps_interactive.pm:146
-#, fuzzy, c-format
+#: steps_interactive.pm:153
+#, c-format
 msgid "Install/Upgrade"
-msgstr "Instalēt/Atjaunin�t"
+msgstr ""
 
-#: steps_interactive.pm:150
-#, fuzzy, c-format
+#: steps_interactive.pm:157
+#, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "Šī ir instalēšana vai atjaunin�šana?"
+msgstr ""
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalēt"
 
-#: steps_interactive.pm:154
-#, fuzzy, c-format
+#: steps_interactive.pm:161
+#, c-format
 msgid "Upgrade %s"
-msgstr "Atjaunin�t"
+msgstr ""
 
-#: steps_interactive.pm:172
-#, fuzzy, c-format
+#: steps_interactive.pm:184
+#, c-format
 msgid "Encryption key for %s"
-msgstr "Šifrēšanas atslēga"
+msgstr ""
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "Instalēju"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1040,38 +1208,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Konfigurēju IDE"
 
-#: steps_interactive.pm:290
-#, fuzzy, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Nav 1MB brīvas vietas s�knēšanas programmai! Instalēšana turpin�sies, bet "
-"lai iel�dētu sistēmu, Jums būs nepieciešams izveidot s�knēšanas programmas "
-"disaka sadaļu programm� DiskDrake"
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Nav 1MB brīvas vietas s�knēšanas programmai! Instalēšana turpin�sies, bet "
-"lai iel�dētu sistēmu, Jums būs nepieciešams izveidot s�knēšanas programmas "
-"disaka sadaļu programm� DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1084,73 +1231,71 @@ msgstr ""
 "Lūdzu ielieciet iek�rt� Cd-Rom \"%s\", kad tas ir izdarīts, nospiediet Labi\n"
 "Ja jums nav šī diska, nospiediet Atcelt, lai neinstalētu no šī Cd-Rom."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Meklēju pieejam�s pakotnes"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
-#, fuzzy, c-format
+#: steps_interactive.pm:428
+#, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"Lūdzu izvēlieties iel�dēt vai saglab�t pakotnes no/uz disketes.\n"
-"Form�ts ir t�ds pats, k� ar auto_install ģenerēt�m disketēm."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Iel�dēt"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Saglab�t"
 
-#: steps_interactive.pm:453
-#, fuzzy, c-format
+#: steps_interactive.pm:438
+#, c-format
 msgid "Bad file"
-msgstr "Iel�dēt failu"
+msgstr ""
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "Pakotņu grupu izvēle"
+msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Izvēlētais apjoms ir liel�ks nek� pieejam� vieta"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Instal�cijas tips"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1159,88 +1304,112 @@ msgstr ""
 "Jūs neizvēlēj�ties nevienu pakotņu grupu.\n"
 "Lūdzu, izvēlieties minim�lo instal�ciju, k�du vēlaties:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Ar X"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Instalēju pakotni %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Ar pamatdokument�ciju (ieteicams!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Patiesi minim�la instal�cija (īpaši bez urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Sagatavoju instalēšanu"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalēju pakotni %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Pakotņu k�rtošanas laik� atkl�ta kļūda:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Tomēr turpin�t?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
-#, fuzzy, c-format
+#: steps_interactive.pm:682
+#, c-format
 msgid "Go back to media and packages selection"
-msgstr "Saglab�t pakotņu izvēli"
+msgstr ""
 
-#: steps_interactive.pm:683
-#, fuzzy, c-format
+#: steps_interactive.pm:685
+#, c-format
 msgid "There was an error installing package %s."
-msgstr "Pakotņu instalēšanas laik� atkl�ta kļūda:"
+msgstr ""
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Pēcinstalēšanas konfigurēšana"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
-#, fuzzy, c-format
+#: steps_interactive.pm:739 steps_list.pm:47
+#, c-format
 msgid "Updates"
 msgstr "Atjaunin�t"
 
-#: steps_interactive.pm:738
-#, fuzzy, c-format
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
+#, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
 "have been updated after the distribution was released. They may\n"
@@ -1251,134 +1420,115 @@ msgid ""
 "\n"
 "Do you want to install the updates?"
 msgstr ""
-"Jums ir iespēja lejupl�dēt atjaunin�tas pakotnes. Šīs pakotnes tika "
-"izlaistas\n"
-"pēc distribūcijas izlaišanas. T�s var saturēt drošības vai kļūdu labojumus.\n"
-"\n"
-"Lai lejupl�dētu šīs pakotnes, Jums jabūt darbojošamies Interneta "
-"savienojumam.\n"
-"\n"
-"Vai Jūs vēlaties instalēt jaunin�jumus?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s uz %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Dzelži"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Skaņas karte"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Vai Jums ir ISA skaņas karte?"
 
-#: steps_interactive.pm:921
-#, fuzzy, c-format
+#: steps_interactive.pm:931
+#, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
-msgstr "Pēc instalēšanas palaidiet \"sndconfig\", lai konfigurētu skaņu karti"
+msgstr ""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Nav atrasta skaņu karte. Pēc instalēšanas izmēģiniet \"harddrake\""
 
-#: steps_interactive.pm:931
-#, fuzzy, c-format
+#: steps_interactive.pm:941
+#, c-format
 msgid "Graphical interface"
-msgstr "X pēc startēšanas"
+msgstr ""
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "TÄ«kls & Internets"
 
-#: steps_interactive.pm:949
-#, fuzzy, c-format
+#: steps_interactive.pm:960
+#, c-format
 msgid "Proxies"
-msgstr "Profils: "
+msgstr ""
 
-#: steps_interactive.pm:950
-#, fuzzy, c-format
+#: steps_interactive.pm:961
+#, c-format
 msgid "configured"
-msgstr "p�rkonfigurēt"
+msgstr ""
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Drošības Līmenis"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Ugunssiena"
 
-#: steps_interactive.pm:983
-#, fuzzy, c-format
+#: steps_interactive.pm:995
+#, c-format
 msgid "activated"
-msgstr "aktivizēt"
+msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "aizliegts"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Sagatavoju s�knēt�ju"
+msgid "Preparing initial startup program..."
+msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, fuzzy, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Izskat�s, ka Jums ir nezin�mas izcelsmes dators,\n"
-"yaboot iel�dēt�js nedarbosies.\n"
-"Instalēšana turpin�sies, bet Jums būs j�izmanto\n"
-"BootX, lai iel�dētu datoru"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Ielieciet tukšu disketi iek�rt� %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Sagatavoju auto instalēšanas disketi"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1389,12 +1539,12 @@ msgstr ""
 "\n"
 "Vai tieš�m vēlaties iziet tūlīt?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Apsveicam"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "P�rstartēt"
@@ -1489,13 +1639,6 @@ msgid ""
 "Users"
 msgstr "Lietot�ji"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "TÄ«kli"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1537,133 +1680,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Iziet"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Biroja programmas: teksta procesori (kword, abiword), izkl�jlapas "
-#~ "(kspread, gnumeric), pdf skatīt�ji, u.c."
-
-#, fuzzy
-#~ msgid "Downloading file %s..."
-#~ msgstr "Nosūtu failus..."
-
-#, fuzzy
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Jūs izvēlēj�ties sekojošu(s) serveri(us): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Šie serveri tiek aktivizēti pēc noklusēšanas. Tiem nav nek�du zin�mu "
-#~ "drošības\n"
-#~ "trūkumu, bet var tikt atrasti k�di jauni. T�d� gadījum� Jums noteikti tie "
-#~ "j�uzlabo\n"
-#~ "pēc iespējas �tr�k.\n"
-#~ "\n"
-#~ "\n"
-#~ "Vai tieš�m vēlaties instalēt šos serverus?\n"
-
-#, fuzzy
-#~ msgid "IceWm Desktop"
-#~ msgstr "Darbavirsma"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "Pieslēdzos spoguļserverim, lai saņemtu pieejamo pakotņu sarakstu"
-
-#, fuzzy
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Nevar atdalīt: %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Sagatavot auto instalēšanas disketi"
-
-#~ msgid "Replay"
-#~ msgstr "Atk�rtot"
-
-#~ msgid "Automated"
-#~ msgstr "Autom�tisks"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Saglab�t pakotņu izvēli"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Vai vēlaties izmantot aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Kļūda, instalējot aboot, \n"
-#~ "vai instalēt piespiedu k�rt� pat tad, ja tiks iznīcin�ta pirm� sadaļa?"
-
-#~ msgid "All"
-#~ msgstr "Viss"
-
-#~ msgid "TV card"
-#~ msgstr "TV karte"
-
-#~ msgid "Boot"
-#~ msgstr "S�knēt"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Autentifik�cija"
-
-#, fuzzy
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "%d pakotnes"
-#~ msgstr[1] "%d pakotnes"
-#~ msgstr[2] "%d pakotnes"
-
-#~ msgid "%d packages"
-#~ msgstr "%d pakotnes"
-
-#~ msgid "Language"
-#~ msgstr "Valodas izvēle"
-
-#~ msgid "License"
-#~ msgstr "Licence"
-
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "Instalēšanas klases izvēle"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "Aprēķinu"
-
-#, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "Instalējamo pakotņu izvēle"
-
-#~ msgid "Users"
-#~ msgstr "Lietot�ji"
-
-#~ msgid "Networking"
-#~ msgstr "TÄ«kli"
-
-#~ msgid "Configure X"
-#~ msgstr "X konfigurēšana"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "Nevar piekļūt kodola moduļiem, atbilstošiem Jūsu kodolam (fails %s nav "
-#~ "atrodams), parasti tas nozīmē, ka iel�des diskete nav sinhronizēta ar "
-#~ "instal�cijas datu nesēju (lūdzu izveidojiet jaun�ku iel�des disketi)"
diff --git a/perl-install/install/share/po/mk.po b/perl-install/install/share/po/mk.po
index a57a52624..f0a27255e 100644
--- a/perl-install/install/share/po/mk.po
+++ b/perl-install/install/share/po/mk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2006-09-24 20:39-0700\n"
 "Last-Translator: Zoran Dimovski <zoki.dimovski@gmail.com>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -22,38 +22,63 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Канцелари�ки"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "For developers!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Thank you!"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Дали имате уште додатни медиуми?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -67,118 +92,181 @@ msgstr ""
 "\n"
 "Дали имате додатен ин�талационен медиум за конфигурирање?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Мрежа (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Мрежа (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Мрежа (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL на огледалото?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL-то мора да започнува �о „ftp://“ или „http://“"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Контактирање �о веб �ајтот на Мандрива Линук� за добивање на ли�тата на "
-"огледала..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Контактирање �о веб �ајтот на %s за добивање на ли�тата на огледала..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"�е може да �е во�по�тави вр�ка веб �траница на „Mageia Linux“ за да �е добие "
-"ли�тата на до�тапни огледала"
+"�е може да �е во�по�тави вр�ка веб �траница на „%s“ за да �е добие ли�тата "
+"на до�тапни огледала"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Изберете огледало од кое да �е преземат пакетите"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "По�тавување на „NFS“"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 "Ве молиме вне�ете го името на домаќинот и директориумот на вашиот „NFS“ "
 "медиум"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Име на домаќинот каде е монтиран „NFS“ ?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Директориум"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "�е мојажам да ја пронајдам hdlist датотеката на ова огледало"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Барање пакети што �е веќе ин�талирањен..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Барање пакети за надградба..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -192,87 +280,87 @@ msgstr ""
 "\n"
 "Дали нави�тина �акате да �е избришат овие пакети?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Грешка при читање на датотеката %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Следниве ди�кови �е преименувани:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (претходно именувано како %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Мрежа"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Ве молиме изберете медиум"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Датотеката веќе по�тои. Да �е запише врз неа?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "�едозволен при�тап"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Лошо „NFS“ име"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "�евалиден медиум %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "�е можат да �е прават �нимки на екран пред партицирање"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Екран�ките �нимки ќе бидат до�тапни по ин�талацијата во %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Ин�талација"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Конфигурација"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Мора да го форматирате и %s"
@@ -297,22 +385,22 @@ msgstr "Подигање на мрежата"
 msgid "Bringing down the network"
 msgstr "Спуштање на мрежата"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Копирање на некои пакети на ди�кот за понатамошна употреба"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Копирањето е во тек"
@@ -342,74 +430,98 @@ msgstr "убаво"
 msgid "maybe"
 msgstr "можеби"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "�ема опи�"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Се �лучи грешка"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Се �лучи фаталната грешка: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d неу�пешни тран�акциии на ин�талацијата"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Ин�талирање на пакетот %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Работна �таница"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Канцелари�ки"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Канцелари�ки програми: обработка на тек�т (OpenOffice.org Writer, Kword), "
-"табеларни пре�метки (OpenOffice.org Calc, Kspread), прегледувачи на „PDF“ "
-"итн."
+"Канцелари�ки програми: обработка на тек�т (LibreOffice Writer, Kword), "
+"табеларни пре�метки (LibreOffice Calc, Kspread), прегледувачи на „PDF“ итн."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Станица за игри"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Забавни програми: аркадни, на табла, �тратегија, итн."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Мултимедијална �таница"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Програми за пуштање и уредување на звук и видео"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Интернет �таница"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -418,193 +530,193 @@ msgstr ""
 "Комплет алатки за читање и пракање е-пошта и ве�ти (mutt, tin..) и "
 "прели�тување на Интернет"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Мрежен компјутер (клиент)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клиенти за различни протоколи, вклучувајќи и „ssh“"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "�латки за ле�но конфигурирање на вашиот компјутер"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Конзол�ки алатки"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Развој"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Документација"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Книги и „Како да“ за „Linux“ и �лободен �офтвер"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "„Linux Standard Base“. Поддршка за апликации од други фирми"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Веб �ервер"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Групи"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Сервер"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Интернет gateway"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Пошта/Ве�ти"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "„Postfix“ �ервер за пошта, „Inn“ �ервер за ве�ти"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Директориум�ки �ервер"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "„FTP“ �ервер"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Име на доменот и �ервер за мрежни информации"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Сервер за �поделување на датотеки и печатач"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "База на податоци"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "„PostgreSQL“ и „MySQL“ �ервер за бази на податоци"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "„PostgreSQL“ и „MariaDB“ �ервер за бази на податоци"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix �ервер за пошта"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "„PostgreSQL“ или „MySQL“ �ервер за бази на податоци"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "„PostgreSQL“ или „MariaDB“ �ервер за бази на податоци"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Мрежен компјутер-�ервер"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Графичка околина"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "„KDE“ работна �таница"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -613,12 +725,12 @@ msgstr ""
 "„К“ работна околина, о�новната графичка околина �о додатна колекција на "
 "придружни алатки"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "„GNOME“ работна �таница"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -626,65 +738,126 @@ msgid ""
 msgstr ""
 "Графичка околина �о кори�нички пакет на алатки и алатки за работната површина"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "„KDE“ работна �таница"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Графичка околина �о кори�нички пакет на алатки и алатки за работната површина"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "„GNOME“ работна �таница"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Работна �таница"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Графичка околина"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "„IceWm“ работна површина"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Графичка околина �о кори�нички пакет на алатки и алатки за работната површина"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "„IceWm“ работна површина"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Графичка околина �о кори�нички пакет на алатки и алатки за работната површина"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "„IceWm“ работна површина"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"„К“ работна околина, о�новната графичка околина �о додатна колекција на "
+"придружни алатки"
+
+#: share/meta-task/compssUsers.pl:199
 #, 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:200
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, итн."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Помошни алатки"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Сервер"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "„Webmin“"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "„Webmin“ оддалечен �ервер за конфигурирање"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Мрежни помошни алатки/надгледување"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "�латки за надгледување, раководење на проце�и, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "„Mageia“ волшебници"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Волшебници за конфигурирање на �ервер"
@@ -698,7 +871,7 @@ msgstr ""
 "Се �лучи грешка, но не знам како добро да �е �правам �о неа.\n"
 "Продолжете на �оп�твен ризик."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -718,254 +891,254 @@ msgstr "Премин на чекор \"%s\"\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux Ин�талација %s"
+msgid "%s Installation %s"
+msgstr "%s Ин�талација %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> помеѓу елементи"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Вашиот �и�тем е �лаб �о ре�ур�и. Може да Ви �е појават проблеми\n"
-"при ин�талирање. �ко тоа �е �лучи, пробајте �о тек�туална ин�талација.\n"
+"при ин�талирање %s. �ко тоа �е �лучи, пробајте �о тек�туална ин�талација.\n"
 "За тоа, прити�нете \"F1\" кога ќе �е подигне цедеромот, и потоа вне�ете\n"
 "\"text\"."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Групна �елекција на пакети"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Минимална ин�талација"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "„IceWm“ работна површина"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "„IceWm“ работна површина"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "„IceWm“ работна површина"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Групна �елекција на пакети"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Подделна �елекција на пакети"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Вкупна големина: %d / %d MB"
+msgid "Unselect All"
+msgstr "Сите �е не�електирани"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Лош пакет"
+msgid "Total size: %d / %d MB"
+msgstr "Вкупна големина: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Верзија:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Големина: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Важно�т: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "�е можете да (не) го изберете овој пакет"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "поради недо�та�ување на %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "поради незадоволување на %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "�е обидувам да промовирам %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "за да �е задржи %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "�е можете да го изберете овој пакет, зашто нема доволно про�тор да �е "
 "ин�талира"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Ќе бидат ин�талирани �ледниве пакети"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Следниве пакети ќе бидат от�транети"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ова е неопходен пакет, и не може да не �е избере"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "�е може да не го изберете овој пакет. Веќе е ин�талиран"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr ""
 "�е можете да не го изберете овој пакет. Тој мора да �е надгради (upgrade)"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Прикажи ги автомат�ки избраните пакети"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Ин�талирај"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Вчитај/зачувај избор"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "О�вежување на изборот на пакети"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Минимална ин�талација"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Менаџмент на �офтвер"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Изберете ги пакетите што �акате да �е ин�талираат"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Ин�талирање"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Без детали"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Прео�танато време "
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Проценка"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d пакети"
 msgstr[1] "%d пакети"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Резиме"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Конфигурирај"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "не е конфигурирано"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Групна �елекција на пакети"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -974,12 +1147,12 @@ msgstr ""
 "Пронајдени �е �ледниве ин�талаци�ки медиуми.\n"
 "�ко �акате да от�транете некои, можете �ега да ги дештиклирате."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Имате опција да ја копирате �одржината на CD-ата на ди�кот, пред �амата "
@@ -987,72 +1160,72 @@ msgstr ""
 "Потоа, ин�талацијата ќе продолжи од хард ди�кот и пакетите ќе бидат до�тапни "
 "�е додека �и�темот е цело�но ин�талиран."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Копирај ги �ите CD-а"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Се �лучи грешка"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Изберете ра�поред на та�татура"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Ова е цело�на ли�та на до�тапни та�татури"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Ин�талирај/�адогради"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Дали е ова ин�талација или надградба?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Ин�талирај"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "�адгради %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Криптирачки клуч за %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Ин�талација"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1061,38 +1234,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Конфигурирање на IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"�ема �лободен про�тор за bootstrap од 1МБ! Ин�талацијата ќе продолжи, но за "
-"да го подигнете Вашиот �и�тем, ќе треба да креирате bootstrap партиција во "
-"DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Треба да креирате „PPC PReP Boot“ подигнување! Ин�талацијата ќе продолжи, но "
-"за да го вклучите вашиот �и�тем, ќе треба да креирате партиција за "
-"подигнување во „DiskDrake“"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1105,19 +1257,19 @@ msgstr ""
 "Вне�ете го CD-то �о на�лов \"%s\" во вашиот уред и прити�нете \"Во ред\".\n"
 "�ко го немате, прити�нете \"Откажи\" за да не ин�талирате од ова CD."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Барање до�тапни пакети..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1126,52 +1278,52 @@ msgstr ""
 "Ве молиме изберете „вчитај“ или „зачувај“ го изборот на пакети\n"
 "Форматот е и�т како за генерирани датотеки од „auto_install“."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Вчитај"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Зачувај"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Лоша датотека"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Групна �елекција на пакети"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Избраната големина е поголема од �лободниот про�тор"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Тип на ин�талација"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1180,88 +1332,112 @@ msgstr ""
 "�е �те избрале ниту една група пакети.\n"
 "Изберете ја минималната ин�талација што ја �акате:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Со X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Ин�талирање на пакетот %s"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Со о�новна документација (препорачано!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Ви�тин�ки минимална ин�талација (без urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Подговтвување на подигачот..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Подготовка на ин�талацијата"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Ин�талирање на пакетот %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Се �лучи грешка во подредувањето на пакетите:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Да продолжиме?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Поврати"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Зачувување на �елекцијата пакети"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Се �лучи грешка во ин�талирањето на пакетите:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "По�т-ин�талациона конфигурација"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Ве молиме проверете дали медиумот �о модулите за надградување е во уредот %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "�адградби"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1282,28 +1458,29 @@ msgstr ""
 "\n"
 "Дали �акате да ги ин�талирате надградбите?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Хардвер(машин�ки дел)"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Звучна картичка"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Дали имате ISA звучна картичка?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1312,82 +1489,70 @@ msgstr ""
 "По ин�талацијата вклучете \"alsaconf\" или \"sndconfig\" за да ја "
 "конфигурирате звучаната картичка"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "�е е детектирана звучна картичка. Обидете �е �о \"harddrake\" по "
 "ин�талацијата"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Графички интерфеј�"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Мрежа и Интернет"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Прок�и"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "конфигурирано"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "�иво на �игурно�т"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "активиран"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "оневозможено"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Се уште го ш конфигурирано Х. Дали нави�тина �акаш да го направиш ова?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Подговтвување на подигачот..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Подготовка на ин�талацијата"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Изгледа дека имате �тара или непозната машина, затоа „yaboot“ подигнувачот "
-"нема да работи. Ин�талацијата ќе продолжи, но ќе треба да кори�тите „BootX“ "
-"или некои други �ред�тва за подигнување на вашата машина. �ргументот на "
-"кернелот за „root fs“ е �ледниов: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1396,17 +1561,17 @@ msgstr ""
 "Во ова безбедно�но ниво, при�тап до датотеките кои �е наоѓаат на „Windows“ "
 "партицијата е дозволен �амо на админи�траторот."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Вне�ете празна ди�кета во %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Создавање ди�кета за авто-ин�талација..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1417,12 +1582,12 @@ msgstr ""
 "\n"
 "Дали нави�тина �акате �ега да напуштите?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Че�титки"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Ре�тартирај"
@@ -1517,13 +1682,6 @@ msgid ""
 "Users"
 msgstr "Кори�ници"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Мрежа"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1566,6 +1724,67 @@ msgid ""
 "Exit"
 msgstr "Излез"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Подговтвување на подигачот..."
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Графичка околина �о кори�нички пакет на алатки и алатки за работната "
+#~ "површина"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "„IceWm“ работна површина"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "�ема �лободен про�тор за bootstrap од 1МБ! Ин�талацијата ќе продолжи, но "
+#~ "за да го подигнете Вашиот �и�тем, ќе треба да креирате bootstrap "
+#~ "партиција во DiskDrake"
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "Треба да креирате „PPC PReP Boot“ подигнување! Ин�талацијата ќе продолжи, "
+#~ "но за да го вклучите вашиот �и�тем, ќе треба да креирате партиција за "
+#~ "подигнување во „DiskDrake“"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Изгледа дека имате �тара или непозната машина, затоа „yaboot“ "
+#~ "подигнувачот нема да работи. Ин�талацијата ќе продолжи, но ќе треба да "
+#~ "кори�тите „BootX“ или некои други �ред�тва за подигнување на вашата "
+#~ "машина. �ргументот на кернелот за „root fs“ е �ледниов: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Добредојдовте"
+
+#~ msgid "Select All"
+#~ msgstr "Слектирани �ите"
+
+#~ msgid "Bad package"
+#~ msgstr "Лош пакет"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Подговтвување на подигачот..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Мрежа"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1613,7 +1832,7 @@ msgstr "Излез"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/mn.po b/perl-install/install/share/po/mn.po
index ee4ebeec6..888f5ad3c 100644
--- a/perl-install/install/share/po/mn.po
+++ b/perl-install/install/share/po/mn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2004-01-02 00:35+0100\n"
 "Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
@@ -19,38 +19,63 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "�лбан газар"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Thank you!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Be Free!"
 msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Та �мар н�г�н %s г���н харагдалттай юу?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -59,112 +84,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "КД-РОМ"
 
-#: any.pm:121
+#: any.pm:163
 #, fuzzy, c-format
 msgid "Network (HTTP)"
 msgstr "Сүлж��"
 
-#: any.pm:122
+#: any.pm:164
 #, fuzzy, c-format
 msgid "Network (FTP)"
 msgstr "Сүлж��"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, fuzzy, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "�айт жиг�аалт аа�."
 
-#: any.pm:187
+#: any.pm:253
 #, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr "�айт жиг�аалт аа�."
 
-#: any.pm:197
+#: any.pm:263
 #, fuzzy, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Сонгох"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Лавлах"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "%s: %s-ийг холбож чадахгүй: %s\n"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -173,89 +263,89 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, fuzzy, c-format
 msgid "Error reading file %s"
 msgstr "Файл уншихад алдаа\n"
 
-#: any.pm:1020
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Дараах багцууд �уулгагдах г�ж байна"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "ТЭ"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Сүлж��"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr ""
 "�өөцлөх зөөврийн төхөөрөмжөө\n"
 "�онгоно уу."
 
-#: any.pm:1118
+#: any.pm:1402
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Файл?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Хандалт нурлаа"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr ""
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Хуваалт үү�г�хийн өмнө агшин д�лг�цүүдийг хийж чадахгүй"
 
-#: any.pm:1242
+#: any.pm:1530
 #, fuzzy, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "�мх"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "Суулгалт"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Тохиргоо"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr ""
@@ -277,22 +367,22 @@ msgstr ""
 msgid "Bringing down the network"
 msgstr ""
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "�мх"
@@ -322,340 +412,422 @@ msgstr "а�тайхан"
 msgid "maybe"
 msgstr "магадгүй"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Тайлбар алга"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Суулгалт боломжтой"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Суулгалтын ангилалыг �онгох"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "LAN Тохируулга"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "�лбан газар"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"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:26
 #, fuzzy, c-format
 msgid "Game station"
 msgstr "Тоглоом"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, fuzzy, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Зугаа ц�нг�л"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Мультимедиа"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, fuzzy, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Дуу"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "Интерн�т"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "аа�"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Сүлж��"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "аа�"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, fuzzy, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Хөгжүүл�л"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, fuzzy, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Баримтжуулалт"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, fuzzy, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Стандарт"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, fuzzy, c-format
 msgid "Web Server"
 msgstr "В�б"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "бүл�г"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, fuzzy, c-format
 msgid "Kolab Server"
 msgstr "Самба"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Интерн�т гарц"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/Файл/_Шин�"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "М�йл"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "С�рг��х Илг��гч"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Сервер"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Дом�йн ��рний Сервер"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Х�вл�гч"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Өгөгдлийн �ан"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
+msgid "PostgreSQL and MariaDB Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "М�йл"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "М�йл"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
+msgid "PostgreSQL or MariaDB database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Сүлж��"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, fuzzy, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Итг�мжил�гч"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, fuzzy, 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:158
 #, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "KDE"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, fuzzy, 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:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr "аа�"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "KDE"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "LAN Тохируулга"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "Шир��ний компьютер"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "аа�"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Шир��ний компьютер"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr "аа�"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Шир��ний компьютер"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "�жилын талбар аа�"
+
+#: share/meta-task/compssUsers.pl:199
 #, fuzzy, c-format
 msgid "Other Graphical Desktops"
 msgstr "Бу�ад"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, fuzzy, 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:223
 #, fuzzy, c-format
 msgid "Utilities"
 msgstr "Филлипинни"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "В�б дуран"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Терминал Сервер"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Сүлж�� толидох"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "Мандрива удирдлагын төв"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "\"%s\" х�вл�гч д��р х�вл�ж байна"
@@ -667,7 +839,7 @@ msgid ""
 "Continue at your own risk."
 msgstr ""
 
-#: steps.pm:443
+#: steps.pm:458
 #, fuzzy, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -683,7 +855,7 @@ msgstr ""
 
 #: steps_curses.pm:22
 #, fuzzy, c-format
-msgid "Mageia Linux Installation %s"
+msgid "%s Installation %s"
 msgstr "Мандрива удирдлагын төв"
 
 #: steps_curses.pm:32
@@ -691,320 +863,320 @@ msgstr "Мандрива удирдлагын төв"
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr ""
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, fuzzy, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr "бол Та вы тек�т тек�т."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Пакет Групп"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Төрөл аа�"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "Шир��ний компьютер"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "Шир��ний компьютер"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "Шир��ний компьютер"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, fuzzy, c-format
 msgid "Package Group Selection"
 msgstr "Пакет Групп"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Ту�даа дан багц �онгох"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
+#, c-format
+msgid "Unselect All"
+msgstr ""
+
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, fuzzy, c-format
 msgid "Total size: %d / %d MB"
 msgstr "�ийт х�мж��"
 
-#: steps_gtk.pm:403
-#, c-format
-msgid "Bad package"
-msgstr "Тааруухан багц"
-
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Хувилбар: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Х�мж��: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d КБ\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, fuzzy, c-format
 msgid "Importance: "
 msgstr "Цонтууд импортлох"
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, fuzzy, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Та"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "Юу ч үгүй"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "�мх"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, fuzzy, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Та бол зүүн"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Дараах багцууд �уулгагдах г�ж байна"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr ""
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr ""
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, fuzzy, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Та бол"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, fuzzy, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Та"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "�втоматаар �онгогд�он багцуудыг харуулах"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Суулга"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "Пакет"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr ""
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr ""
 
-#: steps_gtk.pm:518
-#, c-format
+#: steps_gtk.pm:534
+#, fuzzy, c-format
 msgid "Software Management"
-msgstr ""
+msgstr "Software"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Сонгохыг хү��ж буй багцаа �онгоно уу"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Суулгалт"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, fuzzy, c-format
 msgid "No details"
 msgstr "Үгүй"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Үлд�ж буй хугацаа"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr ""
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "Тааруухан багц"
 msgstr[1] "Тааруухан багц"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Дүгн�лт"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Тохируулах"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr ""
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Пакет Групп"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr ""
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Та гарын байрлалаа �онгоно уу"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "бол бүр�н жиг�аалт аа�"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr ""
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Суулга"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr ""
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Суулгалт"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1013,32 +1185,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE-г тохируулах"
 
-#: steps_interactive.pm:290
-#, fuzzy, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "Үгүй вы �мх"
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr "Үгүй вы �мх"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1047,158 +1204,182 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr ""
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr "ачаалах бол."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Проце��ор ачаалж байна"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Хадгалах"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Файлыг ачаалах"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "Гном"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Пакет Групп"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Сонгогд�он х�мж�� нь боломжтой зайнаа� их байна"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, fuzzy, c-format
 msgid "Type of install"
 msgstr "Төрөл аа�"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, fuzzy, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr "Та бүл�г аа� вы:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "�втоматаар �онгогд�он багцуудыг харуулах"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, fuzzy, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "үгүй"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Суулгалтын б�лтг�л"
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Суулгалтын б�лтг�л"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, fuzzy, c-format
 msgid "Go on anyway?"
 msgstr "Очих?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "С�рг��х"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Хадгалах"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Багцуудыг �уулгахад алдаа гарлаа:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Суулгалтын тохируулгыг батал"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, fuzzy, c-format
 msgid "Updates"
 msgstr "Шин�чл�х"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, fuzzy, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1211,121 +1392,114 @@ msgid ""
 "Do you want to install the updates?"
 msgstr "Та г вы Интерн�т г вы?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s -д %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Техник хангамж"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Дууны карт"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Та ISA дууны карттай юу?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, fuzzy, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "�жиллуулах"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, fuzzy, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Үгүй Reyna"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr ""
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, fuzzy, c-format
 msgid "Network & Internet"
 msgstr "Сүлж��"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "Польш"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, fuzzy, c-format
 msgid "configured"
 msgstr "Тохируулах"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Хамгаалалтын төвшин"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "хаалттай"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Та Х-г тохируулаагүй байна. Та үүнийг хийхд�� итг�лт�й байна уу?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr ""
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Суулгалтын б�лтг�л"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, fuzzy, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Оруулах �мх"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, fuzzy, c-format
 msgid "Creating auto install floppy..."
 msgstr "Үү�г�ж байна."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, fuzzy, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1333,12 +1507,12 @@ msgid ""
 "Do you really want to quit now?"
 msgstr "г вы?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, fuzzy, c-format
 msgid "Congratulations"
 msgstr "Ба�р хүрг�е!"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Дахин ачаал"
@@ -1433,13 +1607,6 @@ msgid ""
 "Users"
 msgstr "Х�р�гл�гчид"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Сүлж��"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1483,6 +1650,44 @@ msgid ""
 msgstr "Гарах"
 
 #, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr "аа�"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Шир��ний компьютер"
+
+#, fuzzy
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr "Үгүй вы �мх"
+
+#, fuzzy
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr "Үгүй вы �мх"
+
+#~ msgid "Welcome"
+#~ msgstr "Тавтай морил"
+
+#, fuzzy
+#~ msgid "Select All"
+#~ msgstr "Сонгогд�он"
+
+#~ msgid "Bad package"
+#~ msgstr "Тааруухан багц"
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Сүлж��"
+
+#, fuzzy
 #~ msgid "Downloading file %s..."
 #~ msgstr "Файлууд илг��ж байна..."
 
diff --git a/perl-install/install/share/po/ms.po b/perl-install/install/share/po/ms.po
index 500e81ffb..358123ca0 100644
--- a/perl-install/install/share/po/ms.po
+++ b/perl-install/install/share/po/ms.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2008-05-01 14:16+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -15,38 +15,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Pejabat/Produktiviti"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Thank you!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Be Free!"
 msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Masukkan fail lain ke file semasa"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -55,112 +80,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, fuzzy, c-format
 msgid "Network (HTTP)"
 msgstr "Pelayan Rangkaian"
 
-#: any.pm:122
+#: any.pm:164
 #, fuzzy, c-format
 msgid "Network (FTP)"
 msgstr "Pelayan FTP"
 
-#: any.pm:123
+#: any.pm:165
 #, fuzzy, c-format
 msgid "Network (NFS)"
 msgstr "Pelayan Rangkaian"
 
-#: any.pm:165
+#: any.pm:224
 #, fuzzy, c-format
 msgid "URL of the mirror?"
 msgstr "URL untuk IG"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: any.pm:227
+#: any.pm:293
 #, fuzzy, c-format
 msgid "NFS setup"
 msgstr "Tetapan Halaman"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, fuzzy, c-format
 msgid "Hostname missing"
 msgstr "Pakej Hilang"
 
-#: any.pm:233
+#: any.pm:299
 #, fuzzy, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Nama Direktori mesti dimulakan dengan slash"
 
-#: any.pm:237
+#: any.pm:303
 #, fuzzy, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Perkongsian NFS Terlekap"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Direktori"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Ralat pada baris %d: %s"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, fuzzy, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Langkau semua pakej dari media \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 
-#: any.pm:369
+#: any.pm:634
 #, fuzzy, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Mencari pakej untuk dinaiktaraf..."
 
-#: any.pm:388
+#: any.pm:653
 #, fuzzy, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Ralat berlaku bila mencari pakej untuk dinaiktaraf."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -169,87 +259,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, fuzzy, c-format
 msgid "Error reading file %s"
 msgstr "Ralat mengimport fail %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Peranti audio berikut telah dikesan."
 
-#: any.pm:1022
+#: any.pm:1306
 #, fuzzy, c-format
 msgid "%s (previously named as %s)"
 msgstr "&Simpan Imej Sebagai"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rangkaian"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Utiliti Media Mudah Alih"
 
-#: any.pm:1118
+#: any.pm:1402
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fail Khas peranti telah wujud dalam gugusan"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Izin ditolak"
 
-#: any.pm:1170
+#: any.pm:1454
 #, fuzzy, c-format
 msgid "Bad NFS name"
 msgstr "Tetap Nama Imej"
 
-#: any.pm:1191
+#: any.pm:1475
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "Media Storan"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr ""
 
-#: any.pm:1242
+#: any.pm:1530
 #, fuzzy, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "dalam"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "Pemasangan sekecil mungkin"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurasikan"
 
-#: install2.pm:168
+#: install2.pm:210
 #, fuzzy, c-format
 msgid "You must also format %s"
 msgstr "Anda mesti masukkan direktori."
@@ -271,22 +361,22 @@ msgstr "Pelayan Rangkaian Lama"
 msgid "Bringing down the network"
 msgstr "Pelayan Rangkaian Lama"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "&Dalam pelayar web"
@@ -318,340 +408,422 @@ msgstr "Bantuan yang mulia"
 msgid "maybe"
 msgstr ""
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Tiada keterangan"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Ralat telah berlaku"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, fuzzy, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Ralat berlaku bila cuba menyalin cekupan skrin."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Pelaksanaan gpg gagal (%d)\n"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Memasang pakej %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "StesyenKerja"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, fuzzy, c-format
 msgid "Office Workstation"
 msgstr "Pejabat/Produktiviti"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"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:26
 #, fuzzy, c-format
 msgid "Game station"
 msgstr "Permainan memori"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Kekunci Multimedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, fuzzy, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Bunyi dan"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "Internet Bergrafik"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "dan dan dan"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Klien Pelayan Terminal"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, fuzzy, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "protokol"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, fuzzy, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ujian"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, fuzzy, c-format
 msgid "Console Tools"
 msgstr "Alatan Pentadbiran"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, fuzzy, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Penyunting fail"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Pembangunan"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, fuzzy, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Pustaka dan fail selitan untuk Oaf."
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentasi"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, fuzzy, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "dan on dan Bebas"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, fuzzy, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Asas"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Pelayan Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Pelayan Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, fuzzy, c-format
 msgid "Firewall/Router"
 msgstr "_Konfigurasikan Firewall"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, fuzzy, c-format
 msgid "Internet gateway"
 msgstr "Internet Bergrafik"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "Pelayan Berita"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Sistem InterNetNews (INN), pelayan berita Usenet."
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Pelayan Direktori"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Pelayan FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Name=Pelayan Fail Awam"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Monitor status Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Pangkalan Data"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
+msgid "PostgreSQL and MariaDB Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Mel"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "Pelayan Nama DNS"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
+msgid "PostgreSQL or MariaDB database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Pelayan Rangkaian Lama"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, fuzzy, c-format
 msgid "Graphical Environment"
 msgstr "Internet Bergrafik"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, fuzzy, c-format
 msgid "KDE Workstation"
 msgstr "Menu KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, fuzzy, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "Desktop Persekitaran asas"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, fuzzy, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome-Breakout"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, fuzzy, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "A pengguna dan"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "Menu KDE"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr "A pengguna dan"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Gnome-Breakout"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "StesyenKerja"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Internet Bergrafik"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "Persekitaran Desktop"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "A pengguna dan"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Persekitaran Desktop"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr "A pengguna dan"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Persekitaran Desktop"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "Desktop Persekitaran asas"
+
+#: share/meta-task/compssUsers.pl:199
 #, fuzzy, c-format
 msgid "Other Graphical Desktops"
 msgstr "Pada Semua Desktop"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, c-format
 msgid "Utilities"
 msgstr "Utiliti"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "Pelayan FTP"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Alatan tetapan pelayan dan klien fax"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Aplet pengawas rangkaian"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia Galaxy"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Sila tetapkan pelayan PXE"
@@ -666,7 +838,7 @@ msgstr ""
 "dengan baik.\n"
 "Teruskan atas risiko anda."
 
-#: steps.pm:443
+#: steps.pm:458
 #, fuzzy, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -682,332 +854,332 @@ msgstr "Langkah pertama"
 
 #: steps_curses.pm:22
 #, fuzzy, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux Update"
+msgid "%s Installation %s"
+msgstr "%s Update"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr ""
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Barisatas pilihan (toggle)"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, fuzzy, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr "Sistem aplet desktop bagi GNOME"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Kamus Lazim:"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "Persekitaran Desktop"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "Persekitaran Desktop"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "Persekitaran Desktop"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, fuzzy, c-format
 msgid "Package Group Selection"
 msgstr "Barisatas pilihan (toggle)"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, fuzzy, c-format
 msgid "Individual package selection"
 msgstr "Barisatas pilihan (toggle)"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, fuzzy, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Saiz lajur automatik"
+msgid "Unselect All"
+msgstr "Aba&i Semua"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, fuzzy, c-format
-msgid "Bad package"
-msgstr "Pelihat Pakej"
+msgid "Total size: %d / %d MB"
+msgstr "Saiz lajur automatik"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versi: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Saiz: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr ""
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr ""
 
-#: steps_gtk.pm:445
-#, fuzzy, c-format
+#: steps_gtk.pm:462
+#, c-format
 msgid "due to missing %s"
-msgstr "&Lompat ke hiperlink"
+msgstr "kerana kehilangan %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "kerana ketidakpuasan %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "cuba untuk menaikkan %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "untuk menyimpan %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, fuzzy, c-format
 msgid "The following packages are going to be installed"
 msgstr ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, fuzzy, c-format
 msgid "The following packages are going to be removed"
 msgstr ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr ""
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr ""
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr ""
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Pasang"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "Barisatas pilihan (toggle)"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, fuzzy, c-format
 msgid "Updating package selection"
 msgstr "Barisatas pilihan (toggle)"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, fuzzy, c-format
 msgid "Minimal install"
 msgstr "Pasang plugin baru"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Pengurusan Perisian"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, fuzzy, c-format
 msgid "Choose the packages you want to install"
 msgstr "Pilih alatan yang anda hendak guna"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Memasang"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, fuzzy, c-format
 msgid "No details"
 msgstr "Maklumat lanjut Susunatur"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Masa Himpun"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr ""
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "Pelihat Pakej"
 msgstr[1] "    Pakej"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Ringkasan"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Buat konfigurasi"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "Tiada"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Barisatas pilihan (toggle)"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, fuzzy, c-format
 msgid "Copy whole CDs"
 msgstr "Main CD audio"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Ralat telah berlaku"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, fuzzy, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Sila pilih jenis logmasuk anda:"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "penuh"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, fuzzy, c-format
 msgid "Install/Upgrade"
 msgstr "Pasang plugin baru"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Katalaluan diperlukan, ini adalah dokumen yang dienkrip"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, fuzzy, c-format
 msgid "Upgrade %s"
 msgstr "Naiktaraf"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, fuzzy, c-format
 msgid "Encryption key for %s"
 msgstr "&Cari Bantuan"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Pemasangan sekecil mungkin"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1016,32 +1188,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, fuzzy, c-format
 msgid "Configuring IDE"
 msgstr "IDE Anjuta"
 
-#: steps_interactive.pm:290
-#, fuzzy, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "Tidak Install dalam"
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr "Tidak Install dalam"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1050,160 +1207,184 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, fuzzy, c-format
 msgid "Looking for available packages..."
 msgstr ""
 "Tiada penerangan didapati untuk %s.\n"
 "\n"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr "on."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Muatan"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Simpan"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Extension &fail:"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Barisatas pilihan (toggle)"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, fuzzy, c-format
 msgid "Type of install"
 msgstr "Jenis per&nomboran:"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, fuzzy, c-format
 msgid "With X"
 msgstr "Dengan penghujung:"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Memasang pakej %s"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, fuzzy, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "asas"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, fuzzy, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "tidak"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Menyediakan pemuatboot..."
+
+#: steps_interactive.pm:643
 #, fuzzy, c-format
 msgid "Preparing installation"
 msgstr "Pemasangan sekecil mungkin"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Memasang pakej %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Tedapat ralat menyusun pakej:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Teruskan juga?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Ulangcuba"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Langkau pakej ini"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Langkau semua pakej dari media \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Kembali ke pemilihan pakej dan media"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Tedapat ralat memasang pakej %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Tetapan pasca pemasangan"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Kemaskini"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1225,125 +1406,114 @@ msgstr ""
 "\n"
 "Adakah anda mahu memasang kemaskini tersebut?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s pada %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Perkakasan"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Kad bunyi"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr ""
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Tiada kad bunyi dikesan. Cuba \"harddrake\" selepas pemasangan."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Antaramuka Bergrafik"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Rangkaian & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proksi"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "ditetapkan"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Tahap Keselamatan"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "dimatikan"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Menyediakan pemuatboot..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Pemasangan sekecil mungkin"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Anda kelihatan mempunyai mesin lama atau yang tidak diketahui, pemuat boot "
-"yaboot tidak akan berfungsi untuk anda. Pemasangan akan diteruskan, tetapi "
-"anda perlu menggunakan BootX atau sebarang cara lain untuk memboot mesin "
-"anda. Hujah kernel untuk sistemfail root adalah: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Masukkan cakera liut kosong dalam pemacu %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Mencipta cakera liut auto pasang..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1351,12 +1521,12 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Tahniah"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Boot semula"
@@ -1451,13 +1621,6 @@ msgid ""
 "Users"
 msgstr "Pengguna"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Rangkaian"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1500,6 +1663,63 @@ msgid ""
 "Exit"
 msgstr "Keluar"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Menyediakan pemuatboot..."
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr "A pengguna dan"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Persekitaran Desktop"
+
+#, fuzzy
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr "Tidak Install dalam"
+
+#, fuzzy
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr "Tidak Install dalam"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Anda kelihatan mempunyai mesin lama atau yang tidak diketahui, pemuat "
+#~ "boot yaboot tidak akan berfungsi untuk anda. Pemasangan akan diteruskan, "
+#~ "tetapi anda perlu menggunakan BootX atau sebarang cara lain untuk memboot "
+#~ "mesin anda. Hujah kernel untuk sistemfail root adalah: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Selamat Datang"
+
+#, fuzzy
+#~ msgid "Select All"
+#~ msgstr "Pilih Semu&a"
+
+#, fuzzy
+#~ msgid "Bad package"
+#~ msgstr "Pelihat Pakej"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Menyediakan pemuatboot..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Rangkaian"
+
 #, fuzzy
 #~ msgid "Downloading file %s..."
 #~ msgstr "Extension &fail:"
@@ -1531,7 +1751,7 @@ msgstr "Keluar"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/mt.po b/perl-install/install/share/po/mt.po
index 66c3bbc0f..d8d15427c 100644
--- a/perl-install/install/share/po/mt.po
+++ b/perl-install/install/share/po/mt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2004-10-04 18:45+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -18,38 +18,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Kompjuter tal-Uffiċċju"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Thank you!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Be Free!"
 msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Għandek iżjed sorsi supplimentari?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -58,116 +83,179 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Network (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Network (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL tal-mera?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Qed nikkuntattja l-website ta' Mageia Linux biex nikseb lista tal-mirja "
-"disponibbli"
+"Qed nikkuntattja l-website ta' %s biex nikseb lista tal-mirja disponibbli"
 
-#: any.pm:187
+#: any.pm:253
 #, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Qed nikkuntattja l-website ta' Mageia Linux biex nikseb lista tal-mirja "
-"disponibbli"
+"Qed nikkuntattja l-website ta' %s biex nikseb lista tal-mirja disponibbli"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Agħżel mera minn fejn trid iġġib il-pakketti"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Direttorju"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Ma nistax insib fajl hdlist fuq din il-mera"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Qed naqra l-pakketti diġà nstallati..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Qed insib pakketti x'naġġorna"
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -180,87 +268,87 @@ msgstr ""
 "\n"
 "Żgur li trid tneħħi dawn il-pakketti?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Problema fil-qari tal-fajl %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "- %s tneħħa\n"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "PFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Network"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Jekk jogħġbok agħżel wieħed"
 
-#: any.pm:1118
+#: any.pm:1402
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fajl diġà jeżisti. Tuża lilu?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permess miċħud"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "ġie miżjud is-sors %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Ma nistax nieħu ritratti tal-iskrin qabel toħloq il-partizzjonijiet"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ir-ritratti jkunu disponibbli wara l-installazzjoni f' %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "Qed ninstalla"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurazzjoni"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Trid ukoll tifformattja %s"
@@ -284,22 +372,22 @@ msgstr "Qed intella' n-network"
 msgid "Bringing down the network"
 msgstr "Qed inniżżel in-network"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Għaddej l-għarfien"
@@ -329,73 +417,98 @@ msgstr "tajjeb"
 msgid "maybe"
 msgstr "forsi"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, fuzzy, c-format
+msgid "No description"
+msgstr "fid-deskrizzjonijiet"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Inqalgħet problema"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Inqalgħet problema fatali: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d tranżazzjonijiet ta' installazzjoni fallew"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Qed jinstalla il-pakkett %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Workstation"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Kompjuter tal-Uffiċċju"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programmi tal-uffiċċju: wordprocessors (OpenOffice.org Writer, Kword), "
-"spreadsheet (OpenOffice.org Calc, Kspread) eċċ"
+"Programmi tal-uffiċċju: wordprocessors (LibreOffice Writer, Kword), "
+"spreadsheet (LibreOffice Calc, Kspread) eċċ"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Logħob"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programmi ta' divertiment: logħob tal-arcaDES, karti, strateġija eċċ"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedja"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programmi għad-daqq u editjar ta' awdjo u video"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -403,193 +516,193 @@ msgid ""
 msgstr ""
 "Sett għodda biex taqra u tibgħat imejl u \"news\", u biex tibbrawżja l-web"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Kompjuter fuq network (klijent)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klijenti għal protokolli differenti, eż. SSH"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Għodda biex tiffaċilita l-konfigurazzjoni tal-kompjuter"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Għodda tal-konsol"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Edituri, shells, għodda tal-fajls, terminals"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Żviluppar"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Libreriji, programmi u fajls għal żviluppar C u C++"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentazzjoni"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Kotba u \"HOWTO\" dwar il-Linux u Softwer Ħieles"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Sapport ta' programmi ta' terzi partiti"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Server tal-web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "Grupp"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Server Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Gateway tal-internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/File/_Ä did"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Server tal-imejl Postfix"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Direttorju minn fejn trid tirrestawra"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "DNS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Server tal-ismijiet tad-dominji"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Server tal-printer"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, fuzzy, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, fuzzy, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Server tad-database PostgreSQL jew MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Server tad-database PostgreSQL jew MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Imejl"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Server tal-imejl Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server tad-database PostgreSQL jew MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Server tad-database PostgreSQL jew MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Kompjuter Server tan-Network"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Servers NFS, SMB, Proxy, ssh"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambjent Grafiku"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Stazzjon KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -598,76 +711,135 @@ msgstr ""
 "K Desktop Environment, l-interfaċċja grafika bażi, b'għażla ta' għodda "
 "jakkumpanjawha"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Stazzjon GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "Stazzjon KDE"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Stazzjon GNOME"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Workstation"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Ambjent Grafiku"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "Desktop"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Desktop"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Desktop"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"K Desktop Environment, l-interfaċċja grafika bażi, b'għażla ta' għodda "
+"jakkumpanjawha"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Desktops Grafiċi Oħrajn"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, eċċ"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, fuzzy, c-format
 msgid "Utilities"
 msgstr "Filippini"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Server SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Webcam"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Konfigurazzjoni tat-Terminal Server"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Monitoraġġ tan-network"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "<b>Prodotti Mageia</b>"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Ma stajtx nikkonfigura l-printer \"%s\"!"
@@ -681,7 +853,7 @@ msgstr ""
 "Inqalgħet problema, imma ma nafx kif nieħu ħsieba sew.\n"
 "Tista' tkompli b'riskju tiegħek"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -701,251 +873,251 @@ msgstr "Dieħel fil-pass \"%s\"\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Installazzjoni Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Installazzjoni %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> bejn l-elementi"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Is-sistema hija nieqsa mir-riżorsi. Jista' jkollok problema biex tinstalla \n"
-"l-Mageia Linux. Jekk jiġri dan, ipprova installazzjoni testwali. Għal dan,\n"
+"l-%s. Jekk jiġri dan, ipprova installazzjoni testwali. Għal dan,\n"
 "agħfas F1 meta titla' s-CD, imbagħad ittajpja \"text\"."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Għażla ta' gruppi ta' pakketti"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Installazzjoni minima"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "Desktop"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "Desktop"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "Desktop"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Għażla ta' gruppi ta' pakketti"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Agħżel pakketti individwalment"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Daqs totali: %d / %d MB"
+msgid "Unselect All"
+msgstr "Xejn magħżul"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Pakkett ħażin"
+msgid "Total size: %d / %d MB"
+msgstr "Daqs totali: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Verżjoni: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Daqs: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Importanza: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Ma tistax tagħżel/tneħħi dan il-pakkett"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "minħabba %s nieqes"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "minħabba %s mhux sodisfatt"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "qed nipprova nippromwovi %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "sabiex inżomm %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Ma tistax tagħżel dan il-pakkett għax ma fadalx biżżejjed spazju għalih"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Dawn huma l-pakketti li se jiġu nstallati"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Dawn huma l-pakketti li se jiġu mneħħija"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Dan il-pakkett huwa kruċjali, ma jistax jitneħħa"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Ma tistax tneħħi l-għażla minn dan il-pakkett, diġà nstallat."
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Ma tistax tneħħi l-għażla minn dan il-pakkett. Irid jiġi aġġornat."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Uri l-pakketti magħżula awtomatikament"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Installa"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "Għażla ta' pakketti"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Qed naġġorna l-għażla ta' pakketti"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Installazzjoni minima"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Maniġġjar ta' softwer"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Agħżel il-pakketti li trid tinstalla"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Qed ninstalla"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Ebda dettalji"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Ħin li fadal "
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Qed nieħu stima"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakketti"
 msgstr[1] "%d pakketti"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Sommarju"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Ikkonfigura"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "mhux konfigurat"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Għażla ta' gruppi ta' pakketti"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -954,81 +1126,81 @@ msgstr ""
 "Dawn is-sorsi ta' installazzjoni instabu.\n"
 "Jekk trid taqbeż uħud minnhom, tista' tneħħi l-marka issa."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Inqalgħet problema"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Jekk jogħġbok agħżel tqassim tat-tastiera"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Din hi lista sħiħa tat-tastieri disponibbli"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installa/AÄ¡Ä¡orna"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Din hija installazzjoni ġdida jew aġġornament?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installa"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "AÄ¡Ä¡orna %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Ċifrarju għal %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Qed ninstalla"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1037,36 +1209,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Qed nikkonfigura IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"M'hemmx spazju għal bootstrap ta' 1MB. L-installazzjoni se tkompli, imma "
-"biex tħaddem is-sistema trid toħloq partizzjoni bootstrap f' Diskdrake."
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"M'hemmx spazju għal bootstrap ta' 1MB. L-installazzjoni se tkompli, imma "
-"biex tħaddem is-sistema trid toħloq partizzjoni bootstrap f' Diskdrake."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1081,19 +1234,19 @@ msgstr ""
 "Jekk m'għandekx din id-diska, agħfas \"Ikkanċella\" biex taqbeż il-pakketti "
 "li qegħdin fuqha."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Qed insib pakketti disponibbli"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1102,52 +1255,52 @@ msgstr ""
 "Jekk jogħġbok agħżel \"ikteb\" jew \"aqra\" l-għażla tal-pakketti fuq\n"
 "flopi. Il-format huwa l-istess bħal diski flopi ġenerati bl-auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, fuzzy, c-format
 msgid "Load"
 msgstr "XLoad"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Ikteb"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "fajl veru"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Għażla ta' gruppi ta' pakketti"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Id-daqs tal-għażla huwa ikbar mill-ispazju disponibbli"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tip ta' installazzjoni"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1156,87 +1309,111 @@ msgstr ""
 "Għadek m'għażilt ebda grupp ta' pakketti\n"
 "Jekk jogħġbok agħżel installazzjoni minima li trid:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Bl-XWindows"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Qed jinstalla il-pakkett %s"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "B' dokumentazzjoni bażika (rakkomandat)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Installazzjoni verament minima (mingħajr urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Qed nipprepara l-bootloader"
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Qed nipprepara l-installazzjoni"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Qed jinstalla il-pakkett %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Kien hemm problema fl-ordni tal-pakketti:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Trid tkompli xorta?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Irrestawra"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Ikteb l-għażla ta' pakketti"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Kien hemm problema fl-installazzjoni tal-pakketti:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Konfigurazzjoni ta' wara l-installazzjoni"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "AÄ¡Ä¡ornamenti"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1259,28 +1436,29 @@ msgstr ""
 "\n"
 "Trid tinstalla dawn l-aġġornamenti?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s fuq %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Ħardwer"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Kard awdjo"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Għandek kard tal-awdjo ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1289,82 +1467,70 @@ msgstr ""
 "Ħaddem \"alsaconf\" jew \"sndconfig\" wara l-installazzjoni biex "
 "tikkonfigura l-kard awdjo."
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Ebda kard tal-awdjo ma nstabet. Ipprova ħaddem \"harddrake\" wara l-"
 "installazzjoni"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfaċċja grafika"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Network u internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxies"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "konfigurat"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Livell ta' sigurtà"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewallr"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "attivat"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "mitfi"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Għadek ma kkonfigurajtx X. Żgur trid hekk?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Qed nipprepara l-bootloader"
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Qed nipprepara l-installazzjoni"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, fuzzy, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Jidher li għandek magna \"OldWorld\" jew mhux \n"
-"magħrufa. Il-bootloader \"yaboot\" m'hux se jaħdem fuqha. \n"
-"L-installazzjoni se tkompli, imma trid tuża BootX biex \n"
-"ittella' l-Linux."
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1373,17 +1539,17 @@ msgstr ""
 "F'dan il-livell ta' sigurtà, l-aċċess għall-fajls fuq il-partizzjoni tal-"
 "Windows huwa ristrett għall-amministratur."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Daħħal flopi vojta fid-drajv %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Qed jinħoloq flopi awto-installazzjoni"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1394,12 +1560,12 @@ msgstr ""
 "\n"
 "Trid toħroġ issa?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Prosit"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Irributja"
@@ -1494,13 +1660,6 @@ msgid ""
 "Users"
 msgstr "Users"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Networking"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1543,6 +1702,65 @@ msgid ""
 "Exit"
 msgstr "Oħroġ"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Qed nipprepara l-bootloader"
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Desktop"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "M'hemmx spazju għal bootstrap ta' 1MB. L-installazzjoni se tkompli, imma "
+#~ "biex tħaddem is-sistema trid toħloq partizzjoni bootstrap f' Diskdrake."
+
+#, fuzzy
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "M'hemmx spazju għal bootstrap ta' 1MB. L-installazzjoni se tkompli, imma "
+#~ "biex tħaddem is-sistema trid toħloq partizzjoni bootstrap f' Diskdrake."
+
+#, fuzzy
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Jidher li għandek magna \"OldWorld\" jew mhux \n"
+#~ "magħrufa. Il-bootloader \"yaboot\" m'hux se jaħdem fuqha. \n"
+#~ "L-installazzjoni se tkompli, imma trid tuża BootX biex \n"
+#~ "ittella' l-Linux."
+
+#~ msgid "Welcome"
+#~ msgstr "Merħba"
+
+#~ msgid "Select All"
+#~ msgstr "Kollox magħżul"
+
+#~ msgid "Bad package"
+#~ msgstr "Pakkett ħażin"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Qed nipprepara l-bootloader"
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Networking"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1594,7 +1812,7 @@ msgstr "Oħroġ"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/nb.po b/perl-install/install/share/po/nb.po
index 0c56683c3..e4d332b43 100644
--- a/perl-install/install/share/po/nb.po
+++ b/perl-install/install/share/po/nb.po
@@ -1,69 +1,91 @@
-# translation of nb.po to Norwegian Bokmål
-# translation of nb.po to
-# translation of DrakX-nb.po to
-# KTranslator Generated File
-# Translation file of Mandriva Linux graphic install
-# Copyright (C) 1999 Mandriva
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Terje Bjerkelia <terje@bjerkelia.com>, 1999-2000.
-# Andreas Bergstrøm <abergstr@halden.net>, 2000.
-# Kenneth Rørvik <kenneth@argon.no-ip.com>, 2003.
-# Per Øyvind Karlsen <peroyvind@sintrax.net>, 2003, 2004.
-# Keld Simonsen <keld@dkuug.dk>, 2004, 2007.
-# Per Øyvind Karlsen <peroyvind@mandrivalinux.org>, 2004, 2005.
-# Eskild Hustvedt <eskild@goldenfiles.com>, 2004.
-# Eskild Hustvedt <zerodogg@skolelinux.no>, 2004, 2005.
-# Per Øyvind Karlsen <pkarlsen@mandriva.com>, 2005, 2006.
-# Marius Laache <blakern_@hotmail.com>, 2007.
-# Per Øyvind Karlsen <peroyvind@mandriva.org>, 2007.
-# Olav Dahlum <odahlum@gmail.com>, 2009, 2010.
+# Translators:
+# Andreas Bergstrøm <abergstr@halden.net>, 2000
+# Eskild Hustvedt <eskild@goldenfiles.com>, 2004
+# Eskild Hustvedt <zerodogg@skolelinux.no>, 2004-2005
+# Keld Simonsen <keld@dkuug.dk>, 2004,2007
+# Kenneth Rørvik <kenneth@argon.no-ip.com>, 2003
+# Marius Laache <blakern_@hotmail.com>, 2007
+# Olav Dahlum <odahlum@gmail.com>, 2009-2010
+# Per Øyvind Karlsen <peroyvind@mandrivalinux.org>, 2004-2005
+# Per Øyvind Karlsen <peroyvind@mandriva.org>, 2007
+# Per Øyvind Karlsen <peroyvind@sintrax.net>, 2003-2004
+# Per Øyvind Karlsen <pkarlsen@mandriva.com>, 2005-2006
 msgid ""
 msgstr ""
-"Project-Id-Version: nb\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2010-03-17 05:45+0100\n"
-"Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
-"Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-26 19:12+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/mageia/"
+"language/nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Skrivebordet på en minnepinne"
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, c-format
+msgid "Office tools"
+msgstr ""
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Mageia Linux-distribusjonen med 100 %% åpen kildekode"
+msgid "For kids"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Utforsk Linux med Mageia One"
+msgid "For family!"
+msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Et fullt Mageia Linux-skrivebord – med brukerstøtte"
+msgid "For developers!"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: Distribusjoner for alle behov"
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Har du flere ekstra medier?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -76,93 +98,90 @@ msgstr ""
 "\n"
 "Har du flere installasjonsmedier å sette opp?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Nettverk (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Nettverk (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Nettverk (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Nettadresse til speilet?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL må starte med ftp:// eller http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Kontakter nettstedet til Mageia Linux for å få listen over tilgjengelige "
-"speil … "
+"Kontakter nettstedet til %s for å få listen over tilgjengelige speil … "
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Klarte ikke å kontakte nettstedet til Mageia Linux for å få listen over "
-"tilgjengelige speil"
+"Klarte ikke å kontakte nettstedet til %s for å få listen over tilgjengelige "
+"speil"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Velg et speil som pakkene kan hentes fra"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-oppsett"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Tast inn vertsnavnet og mappen til ditt NFS-medie"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Vertsnavn mangler"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Mappenavnet må starte med \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Vertsnavn til NFS-monteringen ?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
-msgstr "Katalog"
+msgstr "Mappe"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Ekstra"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -171,23 +190,90 @@ msgstr ""
 "Kan ikke finne pakkelistefil på dette speilet. Kontrollér at adressen er "
 "riktig."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ser på pakker som allerede er installert … "
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Finner pakker som skal oppgraderes … "
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjerner pakker før oppgradering … "
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -201,87 +287,87 @@ msgstr ""
 " \n"
 "Ønsker du å fjerne disse pakkene?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Feil ved lesing av fil %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "De(n) følgende disken(e) fikk nytt navn:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (tidligere kalt %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Nettverk"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Velg et medie"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Filen eksisterer allerede. Overskriv?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Adgang nektet"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Ugyldig NFS-navn"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Feil på media %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Jeg kan ikke ta skjembilder før partisjonering."
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjermbilder vil være tilgjengelig etter installasjon i %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Installasjon"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Du må også formatere %s"
@@ -305,22 +391,22 @@ msgstr "Henter opp nettverket"
 msgid "Bringing down the network"
 msgstr "Tar ned nettverket"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Vennligst vent, henter fil"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "kunne ikke legge til medium"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiér noen pakker på disken for framtidig bruk"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiering pågår"
@@ -350,7 +436,22 @@ msgstr "bra"
 msgid "maybe"
 msgstr "kanskje"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr "Ingen xml-info for mediet «%s», bare delvis resultat for pakke %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Ingen beskrivelse"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -359,66 +460,76 @@ msgstr ""
 "Noen pakker krevet av %s kan ikke installeres\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "En feil oppstod:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Det oppsto en kritisk feil: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Ikke spør igjen"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d mislykket installasjonstransaksjon"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installasjon av pakker feilet:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontorarbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Kontorstøtteprogrammer: tekstbehandlere (OpenOffice.org Writer, Kword), "
-"regneark (OpenOffice.org Calc, Kspread), PDF-framvisere, etc"
+"Kontorstøtteprogrammer: tekstbehandlere (LibreOffice Writer, Kword), "
+"regneark (LibreOffice Calc, Kspread), PDF-framvisere, etc"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Spillstasjon"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Underholdningsprogrammer: arkade, brettspill, strategi, etc"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediastasjon"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Lyd- og videoavspilling/redigeringsprogrammer"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internettstasjon"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -427,193 +538,193 @@ msgstr ""
 "Sett med verktøy for å lese og sende e-post og njus (mutt, tin..) og til å "
 "surfe på nettet"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Nettverksmaskin (klient)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienter for forskjellige protokoller inkludert ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Verktøy for å forenkle oppsettet av maskinen din"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsollverktøy"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Tekstprogrammer, skall, filverktøy, terminaler"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Utvikling"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C- og C++-utviklingsbibliotek, -programmer og include-filer"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Bøker og Howto's om Linux og fri programvare"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Støtte for tredjeparts programvare"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Webtjener"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Gruppevare"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab-tjener"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Brannmur/ruter"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internett-gateway"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "E-post/Njus"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix e-posttjener, Inn njustjener"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Katalogtjener"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-tjener"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domenenavn- og nettverksinformasjons-tjener"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fil- og Skriverdelingstjener"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-Tjener, Samba-tjener"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL- og MySQL-databasetjener"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL- og MariaDB-databasetjener"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix e-posttjener"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL eller MySQL-databasetjener"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL eller MariaDB-databasetjener"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Nettverksmaskintjener"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -622,12 +733,12 @@ msgstr ""
 "K Desktop Environment, grunnleggende grafisk miljø med en samling av "
 "passende verktøy"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -636,66 +747,121 @@ msgstr ""
 "Et grafisk miljø med et brukervennlig sett av programmer og "
 "skrivebordsverktøy"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-skrivebord"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Et lettvekts og raskt grafisk miljø med et brukervennlig sett av programmer "
-"og skrivebordsverktøy"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andre grafiske skrivebord"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Verktøy"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-tjener"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin Fjernadministrasjonstjener"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Nettverks-verktøy/overvåkning"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Overvårkningsverktøy, prosessbokføring, tcpdump, nmap,  … "
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia-veivisere"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Veivisere til å sette opp tjener"
@@ -710,7 +876,7 @@ msgstr ""
 "måte.\n"
 "Fortsett på eget ansvar."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -729,253 +895,253 @@ msgstr "Entrer trinn `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux-installasjon %s"
+msgid "%s Installation %s"
+msgstr "%s-installasjon %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> mellom elementene"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg-tjeneren er treg å starte. Vennligst vent … "
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Systemet ditt har lite ressurser. Du kan muligens oppleve noen problemer\n"
-"ved installering av Mageia Linux. Hvis dette skjer kan du prøve installasjon "
-"i tekstmodus\n"
+"ved installering av %s. Hvis dette skjer kan du prøve installasjon i "
+"tekstmodus\n"
 "i stedet. Trykk `F1' ved oppstart av CD-ROM, skriv så `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr "Medievalg"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Installer Mageia KDE-skrivebord"
+msgid "Install %s KDE Desktop"
+msgstr "Installer %s KDE-skrivebord"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Installer Mageia GNOME-skrivebord"
+msgid "Install %s GNOME Desktop"
+msgstr "Installer %s GNOME-skrivebord"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Skreddersydd installasjon"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE-skrivebord"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME-skrivebord"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Tilpasset skrivebord"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Her er en forhåndsvisning av skrivebordet «%s»."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klikk på bildene for å se en større forhåndsvisning"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuelt pakkevalg"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Total størrelse: %d / %d MB"
+msgid "Unselect All"
+msgstr "Velg bort alle"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Ugyldig pakke"
+msgid "Total size: %d / %d MB"
+msgstr "Total størrelse: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versjon: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Størrelse: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Viktighet: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Du kan ikke velge (bort) denne pakken"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "pga. manglende %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "pga. utilfredsstilt %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "prøver å promotere %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "for å beholde %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Du kan ikke velge denne pakken da det ikke er igjen nok plass til å "
 "installere den"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Følgende pakker vil bli installert"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Følgende pakker vil bli fjernet"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Dette er en obligatorisk pakke, den kan ikke fjernes"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Du kan ikke fjerne denne pakken. Den er allerede installert"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Du kan ikke fjerne denne pakken. Den må oppgraderes"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Vis automatisk valgte pakker"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Installer"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Last inn/lagre utvalg"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Oppdaterer pakkevalg"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal installasjon"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Programvarehåndtering"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du ønsker å installere"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installerer"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Ingen detaljer"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Tid som gjenstår:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(beregner … )"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakke"
 msgstr[1] "%d pakker"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Oppsummering"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Sett opp"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "ikke satt opp"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Medievalg"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -984,12 +1150,12 @@ msgstr ""
 "Følgende installasjonsmedia har blitt funnet.\n"
 "Hvis du vill hoppe over noen av de kan du velge de vekk nå."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Du har valget mellom å kopiere innholdet på CDene til harddisken før "
@@ -997,72 +1163,72 @@ msgstr ""
 "Den vil da fortsette fra harddisken og pakkene vil forbli tilgjengelige når "
 "systemet er fullstendig installert."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiér hele CDer"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "En feil oppstod"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Velg ditt tastaturoppsett"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Her er den komplette listen over tilgjengelige tastatur"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installer/Oppgrader"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Er dette en installasjon eller en oppgradering?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installér"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Oppgrader %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Krypteringsnøkkel for %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Avbryt installasjonen, start systemet på nytt"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Ny installasjon"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Oppgrader forrige versjon (ikke anbefalt)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1070,45 +1236,18 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Installasjonsprogrammet har oppdaga at den gamle utgava av Mageia Linux som "
-"du har installert ikke kan trygt oppgraderes til %s.\n"
-"\n"
-"Du bør velge en nyinstallering, som da vil erstatta den gamle versjonen.\n"
-"\n"
-"Advarsel: Du bør ta reservekopi av alle personlige data før du velger "
-"«Nyinstallering»."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Setter opp IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Det er ikke plass for 1 MB bootstrap! Installasjonen vil fortsette, men for "
-"å boote systemet ditt, må du lage en bootstrap-partisjon i DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Du må lage en PPC PReP Boot bootstrap! Installasjonen vil fortsette, men for "
-"å kunne starte systemet ditt vil du måtte opprette en bootstrap-partisjon i "
-"DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1121,12 +1260,12 @@ msgstr ""
 "Sett inn CDen merket «%s» i stasjonen og trykk Ok når du er ferdig.\n"
 "Hvis du ikke har den, trykk Avbryt for å unngå installasjon fra denne CDen."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Søker etter tilgjengelige pakker"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1135,7 +1274,7 @@ msgstr ""
 "Systemet har ikke nok gjenværende diskplass for installasjon eller "
 "oppgradering (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1144,54 +1283,54 @@ msgstr ""
 "Velg lagre eller hent pakkevalg.\n"
 "Formatet er det samme som for auto_install-genererte filer."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Last inn"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Lagre"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Ødelagt fil"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Skrivebordsvalg"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 "Her kan du velge skrivebordprofilen for systemet; «KDE», «GNOME» eller "
 "«Skreddersydd»."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valgt størrelse er større enn tilgjengelig plass"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Type installasjon"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1200,87 +1339,111 @@ msgstr ""
 "Du har ikke valgt noen pakkegrupper.\n"
 "Velg den minimale installasjonen du ønsker:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Installerer foreslåtte pakker"
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med grunnleggende dokumentasjon (anbefalt!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Virkelig minimal installasjon (uten urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Det var en feil ved endring av pakkenes rekkefølge:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Fortsett uansett?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Hopp over denne pakken"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Hopp over alle pakker fra media \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "GÃ¥ tilbake til valg av media og pakker"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Feil under installering av pakke %s"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Oppsett etter installering"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Vennligst forsikre deg om at medie med oppdaterte moduler er i %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1299,28 +1462,29 @@ msgstr ""
 "\n"
 "Ønsker du å installere oppdateringene?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du et ISA-lydkort?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1329,82 +1493,70 @@ msgstr ""
 "Kjør «alsaconf» eller «sndconfig» etter installasjonen for å sette opp "
 "lydkortet ditt"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Lydkort ikke oppdaget. Prøv \"harddrake\" etter installasjonen"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grensesnitt"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Nettverk & internett"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Mellomtjenere"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "satt opp"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Sikkerhetsnivå"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktivert"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "deaktiver"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Du har ikke satt opp det grafiske grensesnittet Xorg. Er du sikker på at du "
 "ikke vil gjøre dette?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Klargjør oppstartslaster … "
+msgid "Preparing initial startup program..."
+msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Vennligst vær tålmodig, dette kan ta en stund … "
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Det virker som du har en OldWorld eller ukjent maskin, yaboot-"
-"oppstartslasteren vil ikke virke for deg. Installasjonen vil fortsette, men "
-"du må bruke BootX eller andre måter for å starte din maskin. "
-"Kjerneargumentet for root-filsystemet er: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1413,17 +1565,17 @@ msgstr ""
 "I dette sikkerhetsnivået er tilgang til Windows-partisjonen forbeholdt "
 "administratoren."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Oppretter diskett for autoinstallasjon … "
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1434,12 +1586,12 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å avslutte nå?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulerer"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Restart"
@@ -1534,13 +1686,6 @@ msgid ""
 "Users"
 msgstr "Brukere"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Nettverk"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1582,10 +1727,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Avslutt"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Kontorstøtteprogrammer: tekstbehandlere (kword, abiword), regneark "
-#~ "(kspread, gnumeric), pdf-framvisere etc"
diff --git a/perl-install/install/share/po/nl.po b/perl-install/install/share/po/nl.po
index 8b9384e97..dff867030 100644
--- a/perl-install/install/share/po/nl.po
+++ b/perl-install/install/share/po/nl.po
@@ -1,59 +1,86 @@
 # translation of DrakX.po to Nederlands
 # Dutch translation of DrakX.
-# Copyright (C) 2000, 2005, 2008 Free Software Foundation, Inc.
 # Copyright (c) 2000 Mandriva
+# Copyright (c) 2011 Mageia
 #
 # Niels Gras <niels.gras@wanadoo.nl>, 2000.
 # Jeroen ten Berge <j.ten.berge@twinbit.nl>, 2002.
 # Reinout van Schouwen <reinout@gmail.com>, 2002-2009.
 # Peter Bosch <peter.bosch@hccnet.nl>, 2002.
 # Rob Teng <mandrake.tips@free.fr>, 2005, 2008.
+# Remco Rijnders <remco@webconquest.com>, 2011-2013.
+# Marja van Waes <marja@mageia.org>, 2013, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: drakx_install\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-04-10 10:20+0200\n"
-"Last-Translator: Reinout van Schouwen <reinout@gmail.com>\n"
-"Language-Team: Nederlands\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-20 07:42+0200\n"
+"Last-Translator: Marja van Waes <marja@mageia.org>\n"
+"Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Uw bureaublad op een USB-stick"
+msgid "Join Us!"
+msgstr "Sluit u bij ons aan!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "De 100%% opensource Mageia Linux-distributie"
+msgid "Make it yours!"
+msgstr "Maak het u eigen!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Gemakkelijk Linux verkennen met Mageia One"
+msgid "Your choice!"
+msgstr "Uw keuze!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Een volledig Mageia Linux-bureaublad, met ondersteuning"
+msgid "Office tools"
+msgstr "Kantoortools"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia-distributies: voor elk wat wils"
+msgid "Home entertainment"
+msgstr "Home-entertainment"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Voor kinderen"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Voor gezinnen!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Voor ontwikkelaars!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Dank u!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Wees Vrij!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Heeft u nog aanvullende media?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -67,93 +94,91 @@ msgstr ""
 "\n"
 "Heeft u een aanvullend installatiemedium in te stellen?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "cd-rom"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Netwerk (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Netwerk (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Netwerk (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL van de mirror?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL dient te starten met ftp:// of http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Bezig te verbinden met de Mageia Linux-website om de lijst met beschikbare "
-"mirrors op te halen…"
+"Er wordt verbinding gemaakt met de %s website om een lijst met beschikbare "
+"spiegelservers te verkrijgen..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Het verbinden met de Mageia Linux-website om de lijst met beschikbare "
-"mirrors op te halen is mislukt"
+"Er kon geen verbinding gemaakt worden met %s website om een lijst met "
+"beschikbare spiegelservers te verkrijgen"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Kies een mirror om de pakketten van af te halen"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-configuratie"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Vul de hostnaam en map van uw NFS media in"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Hostnaam ontbreekt"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Map dient te beginnen met \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Hostnaam van het NFS-koppelpunt?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Map"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Aanvullend"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -162,23 +187,99 @@ msgstr ""
 "Kan hdlist-bestand op deze mirror niet vinden. Controleer of de locatie "
 "klopt."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core-uitgave"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted-uitgave"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree-uitgave"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Bepaalde hardware in uw machine behoeft niet-vrije firmware alvorens de "
+"vrije stuurprogrammatuur kan werken."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "U dient \"%s\" in te schakelen"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" bevat de diverse onderdelen van de systemen en hun toepassingen"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" bevat niet-vrije software.\n"
+
+#: any.pm:477
+#, 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 ""
+"Het bevat ook firmware-bestanden welke nodig zijn om bepaalde apparatuur te "
+"laten werken (bijv: bepaalde ATI/AMD-grafische kaarten, bepaalde "
+"netwerkkaarten, bepaalde RAID-kaarten, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" bevat software welke niet in alle landen vrijelijk gedistribueerd kan "
+"worden als gevolg van software patenten."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"Het bevat ook software uit \"%s\" welke herbouwd is met additionele "
+"mogelijkheden."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Hier kunt u indien gewenst meerdere media inschakelen."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Dit medium biedt updates voor \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Inventarisatie van reeds geïnstalleerde pakketten…"
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Zoeken naar pakketten om op te waarderen…"
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Verwijderen van pakketten vóór opwaardering..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -192,87 +293,87 @@ msgstr ""
 "\n"
 "Weet u zeker dat u deze pakketten wilt verwijderen?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fout bij het lezen van bestand %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "De volgende schijf/schijven zijn hernoemd:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (heette voorheen %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Netwerk"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Kies een medium"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Bestand bestaat reeds. Overschrijven?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Toegang geweigerd"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Slechte NFS naam"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Ongeldig medium %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Kan geen schermafdruk maken voor het partitioneren"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Schermafdrukken zullen beschikbaar zijn na installatie in %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Installatie"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "U dient tevens %s te formatteren"
@@ -296,22 +397,22 @@ msgstr "Bezig met opstarten van het netwerk"
 msgid "Bringing down the network"
 msgstr "Bezig met stoppen van het netwerk"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Even geduld, bestand wordt opgehaald"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "niet in staat medium toe te voegen"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiëren van enkele pakketten op diskettes voor toekomstig gebruik"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Bezig met kopiëren"
@@ -341,7 +442,23 @@ msgstr "leuk"
 msgid "maybe"
 msgstr "misschien"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Pakketinformatie wordt uit de XML-metadata geëxtraheerd..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Geen XML-info voor medium ‘%s’, slechts gedeeltelijk resultaat voor pakket %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Geen omschrijving"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -350,66 +467,76 @@ msgstr ""
 "Sommige door %s gevraagde pakketten kunnen niet worden geïnstalleerd:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Er is een fout opgetreden:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Er is een fatale fout opgetreden: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Vraag niet nogmaals"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installatie-transacties mislukt"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installatie van pakketten mislukt:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Werkstation"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Kantooromgeving"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Kantoorprogramma's: tekstverwerkers (OpenOffice.org Writer, Kword), "
-"rekenbladen (OpenOffice.org Calc, Kspread), PDF-lezers, etc"
+"Kantoorprogramma's: tekstverwerkers (LibreOffice Writer, Kword), rekenbladen "
+"(LibreOffice Calc, Kspread), PDF-lezers, etc"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Game-station"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Amusementsprogramma's: arcade, bordspellen, strategie etc"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedia-station"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Geluids- en video-afspeel- en bewerkingsprogramma's"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet-station"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -418,193 +545,193 @@ msgstr ""
 "Verzameling programma's om e-mail en usenet nieuws mee te lezen en te "
 "schrijven, en om het Web mee door te bladeren"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Netwerk-computer (client)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients voor verschillende protcollen waaronder ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Programma's om de configuratie van uw computer te vergemakkelijken"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Hulpprogramma's voor de opdrachtregel"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editors, shells, bestandsbeheer, terminals"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Ontwikkeling"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C and C++ ontwikkelingsbibliotheken, programma's en include-bestanden"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Boeken en Howto's over Linux en Vrije Software"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standaard-Basis. Ondersteuning voor toepassingen van derden."
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Webserver"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet gateway"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "E-mail/nieuws"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix e-mailserver, Inn newsserver"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Gidsserver"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-server"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domeinnaam- en Network Information Server"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Gedeelde bestands- en printerserver"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL en MySQL database-server"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL en MariaDB database-server"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "E-mail"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix e-mailserver"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL of MySQL database-server"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL of MariaDB database-server"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Netwerk-computer server"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafische omgeving"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-werkomgeving"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -613,12 +740,12 @@ msgstr ""
 "Het K Desktop Environment, de basis-grafische omgeving met een verzameling "
 "van bijbehorende programma's"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-werkomgeving"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -627,66 +754,127 @@ msgstr ""
 "Een grafische omgeving met gebruikersvriendelijke verzameling toepassingen "
 "en bureaublad-programma's"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "XFCE-werkomgeving"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Een lichtere grafische omgeving met een gebruiksvriendelijke set "
+"toepassingen en bureaublad-programma's"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "MATE-werkomgeving"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Cinnamon-werkomgeving"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Een op GNOME gebaseerde grafische omgeving"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "LXQT-werkomgeving"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Een 'next generation' QT-port van de lichtgewicht grafische omgeving"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Enlightnement e17-werkomgeving"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Een snelle lichtgewicht grafische omgeving met gebruiksvriendelijke set "
+"toepassingen en bureaublad-programma's"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-werkomgeving"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Een snelle lichtgewicht grafische omgeving"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasma-werkomgeving"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Een lichtgewicht- en snelle grafische omgeving met gebruiksvriendelijke set "
-"toepassingen en bureaublad-programma's"
+"De Plasma-werkomgeving, de basis-grafische omgeving met een verzameling van "
+"bijbehorende programma's"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andere grafische omgevingen"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, enz"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Hulpprogramma's"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-server"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin-server voor configuratie op afstand"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Netwerk-hulpprogramma's/observatie"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Observatieprogramma's, bijhouden van processen, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia-wizards"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Wizards om server te configureren"
@@ -700,7 +888,7 @@ msgstr ""
 "Er is een fout opgetreden waarvoor de juiste afhandeling onbekend is.\n"
 "Als u verdergaat, is dit op eigen risico."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -720,254 +908,253 @@ msgstr "Overgang naar stap `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux installatie %s"
+msgid "%s Installation %s"
+msgstr "%s Installatie %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> tussen elementen"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "De Xorg-server start langzaam. Even geduld…"
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Uw systeem heeft weinig bronnen beschikbaar. U zou problemen kunnen\n"
-"ondervinden bij het installeren van Mageia Linux. Als dit gebeurt,\n"
-"kunt u een tekstinstallatie proberen. Om dit te doen, drukt u op `F1'\n"
-"terwijl de CDROM opstart, en dan voert u `text' in."
+"Uw systeem heeft weinig systeembronnen beschikbaar. Het kan zijn dat u "
+"problemen ondervindt bij het installeren van %s. In dat geval kunt u een "
+"tekstinstallatie proberen. Druk 'F1' bij het opstarten van de disc, en toets "
+"dan in: 'text'."
+
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr "Mediaselectie"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Mageia KDE-werkomgeving installeren"
+msgid "Install %s KDE Desktop"
+msgstr "Installeer de %s KDE Desktop"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Mageia GNOME-werkomgeving installeren"
+msgid "Install %s GNOME Desktop"
+msgstr "Installeer de %s GNOME Desktop"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Aangepaste installatie"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE-werkomgeving"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Gnome-werkomgeving"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Aangepaste werkomgeving"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Hier is een voorproefje van de '%s'-werkomgeving."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klik op het beeld voor een grotere versie"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakketgroepselectie"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuele pakketselectie"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Totale grootte: %d / %d MB"
+msgid "Unselect All"
+msgstr "Alle gedeselecteerd"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Onbruikbaar pakket"
+msgid "Total size: %d / %d MB"
+msgstr "Totale grootte: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versie: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Grootte: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d kB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Belang: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "U kunt dit pakket niet (de)selecteren"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "ten gevolge van ontbrekende %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "ten gevolge van onvoldane %s"
 
-# Wat wordt hier precies bedoeld?
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "proberen om %s te promoveren"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "om %s te kunnen behouden"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "U kunt dit pakket niet selecteren omdat er te weinig ruimte over is om het "
 "te installeren"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "De volgende pakketten zullen geïnstalleerd worden"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "De volgende pakketten zullen gedeïnstalleerd worden"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Dit is een verplicht pakket, het kan niet gedeselecteerd worden"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "U kunt dit pakket niet deselecteren. Het is al geïnstalleerd."
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "U kunt dit pakket niet deselecteren. Het moet opgewaardeerd worden."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Automatisch geselecteerde pakketten tonen"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Installatie"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Selectie laden/opslaan"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Verversen van pakketselectie"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimale installatie"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Softwarebeheer"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Kies de pakketten die u wenst te installeren"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installeren"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Geen details"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Resterende tijd:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(schatten…)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakket"
 msgstr[1] "%d pakketten"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Overzicht"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configureren"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "niet geconfigureerd"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Mediaselectie"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -976,12 +1163,12 @@ msgstr ""
 "De volgende installatiemedia zijn gevonden.\n"
 "Indien u sommige wilt overslaan, kunt u ze nu deselecteren."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "U heeft de mogelijkheid om de inhoud van de CD's naar de harde schijf te "
@@ -989,72 +1176,72 @@ msgstr ""
 "De installatie gaat dan door vanaf de harde schijf en de pakketten blijven "
 "beschikbaar zodra het systeem volledig geïnstalleerd is."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Hele cd's kopiëren"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Er is een fout opgetreden"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Kies uw toetsenbord-indeling"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Dit is de volledige lijst van beschikbare toetsenborden:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installatie/Opwaardering"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Wilt u opwaarderen of een nieuwe installatie uitvoeren?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installatie"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s opwaarderen"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Vercijferingssleutel voor %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Installatie afbreken, systeem herstarten"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Nieuwe installatie"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Bestaande installatie opwaarderen (niet aanbevolen)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1062,48 +1249,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Het installatieprogramma heeft vastgesteld dat het geïnstalleerde Mageia "
-"Linux-systeem\n"
-"niet veilig bijgewerkt kan worden tot %s.\n"
+"Het installatieprogramma heeft vastgesteld dat uw Linux-systeem niet veilig "
+"kan worden bijgewerkt naar %s.\n"
 "\n"
-"Een nieuwe installatie die de bestaande vervangt is aan te raden.\n"
+"Een nieuwe installatie ter vervang van uw vorige wordt aangeraden.\n"
 "\n"
-"Waarschuwing: maak veiligheidskopieën van alle persoonlijke gegevens "
-"alvorens\n"
-"\"Nieuwe installatie\" te kiezen."
+"WAARSCHUWING: Maak een eerst een back-up van al uw persoonlijke data voordat "
+"u een nieuwe installatie kiest."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE-Configuratie"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Er is geen vrije ruimte voor een \"bootstrap\" van 1MB! De installatie zal "
-"doorgaan, maar om uw systeem op te starten zult u de bootstrap partitie in "
-"DiskDrake moeten creëren."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"U dient een PPC PReP Boot bootstrap aan te maken! Installatie zal verder "
-"gaan, maar om uw systeem op te starten zult u de bootstrappartitie in "
-"DiskDrake moeten creëren."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1118,12 +1282,12 @@ msgstr ""
 "Als u deze CD niet heeft, klik dan Annuleren om verdere installatie vanaf "
 "deze CD te vermijden."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Bezig met zoeken naar beschikbare pakketten"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1132,7 +1296,7 @@ msgstr ""
 "Uw systeem heeft niet genoeg ruimte over voor installatie of opwaardering "
 "(%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1141,52 +1305,52 @@ msgstr ""
 "U kunt kiezen of u de pakketselectie wilt laden of opslaan.\n"
 "Het formaat is dezelfde als de met auto_install gegenereerde bestanden."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Laden"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Opslaan"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Ongeldig bestand"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "Gnome"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Werkomgevingselectie"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "U kunt de grafische omgeving voor uw werkstation kiezen."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "De geselecteerde grootte is meer dan de beschikbare ruimte"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Type installatie"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1195,87 +1359,115 @@ msgstr ""
 "U heeft geen enkele pakketgroep geselecteerd\n"
 "Gelieve de minimale installatie die u wenst te kiezen."
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Met X"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Bezig met installeren van pakket %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr "Installeer aangeraden pakketten"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Met basis-documentatie (aanbevolen!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Werkelijk minimale installatie (in het bijzonder geen urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Voorbereiden van de opwaardering..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Bezig met voorbereiden van installatie"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Bezig met installeren van pakket %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Er is een fout opgetreden bij het sorteren van de pakketten:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Toch verdergaan?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Opnieuw proberen"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Dit pakket overslaan"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Alle pakketten van medium ‘%s’ overslaan"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Terug naar media- en pakketselectie"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Er is een fout opgetreden bij het installeren van pakket %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuratie na installatiestap"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Zorg ervoor dat de Update Modules-media zich in station %s bevindt"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Updates"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "U kunt nu online media instellen."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Dat maakt beveiligingsupdates installeren mogelijk."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Om deze media in te stellen, dient uw internetverbinding \n"
+"te werken. \n"
+"\n"
+"Wilt u de updatemedia instellen?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1295,28 +1487,29 @@ msgstr ""
 "\n"
 "Wenst u de bijgewerkte pakketten te installeren?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s op %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Apparatuur"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Geluidskaart"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Heeft u een ISA geluidskaart?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1325,81 +1518,68 @@ msgstr ""
 "Voer \"alsaconf\" of \"sndconfig\" na de installatie uit om uw geluidskaart "
 "te configureren"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Geen geluidskaart bespeurd. Probeer \"harddrake\" na de installatie"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafische interface"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Netwerk & internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxy's"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "geconfigureerd"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Beveiligingsniveau"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "geactiveerd"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "uitgeschakeld"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "U heeft X niet geconfigureerd. Weet u zeker dat u dit wilt?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Klaarmaken van opstartlader…"
+msgid "Preparing initial startup program..."
+msgstr "Bezig met voorbereiden van het initiële startprogramma..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Een moment geduld, dit kan even duren…"
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Het heeft er alle schijn van dat u een OldWorld- of Onbekende machine heeft. "
-"De yaboot opstartlader zal voor u niet werken. De installatie zal doorgaan, "
-"maar u zult BootX of een andere methode nodig hebben om uw machine op te "
-"starten. Het argument om aan de kernel mee te geven voor het root-"
-"bestandssysteem is: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1408,17 +1588,17 @@ msgstr ""
 "In dit beveiligingsniveau wordt toegang tot de bestanden op de Windows-"
 "partitie voorbehouden aan de systeembeheerder."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Plaats een lege diskette in station %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Aanmaken van auto-installatiediskette…"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1429,12 +1609,12 @@ msgstr ""
 "\n"
 "Weet u zeker dat u op dit moment wilt afsluiten?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Gefeliciteerd"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Herstarten"
@@ -1471,7 +1651,7 @@ msgstr "Muis"
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
-msgstr "Harde schijf-detectie"
+msgstr "Harddisk detectie"
 
 #: steps_list.pm:21 steps_list.pm:22
 #, c-format
@@ -1529,13 +1709,6 @@ msgid ""
 "Users"
 msgstr "Gebruikers"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Netwerktoepassingen"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1578,107 +1751,80 @@ msgid ""
 "Exit"
 msgstr "Afsluiten"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Klaarmaken van opstartlader…"
+
 #~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
 #~ msgstr ""
-#~ "Kantoorprogramma's: tekstverwerkers (kword, abiword), rekenbladen "
-#~ "(kspread, gnumeric), PDF-lezers, etc"
+#~ "Een lichtgewicht- en snelle grafische omgeving met gebruiksvriendelijke "
+#~ "set toepassingen en bureaublad-programma's"
+
+#~ msgid "RazorQT Desktop"
+#~ msgstr "RazorQT-werkomgeving"
 
 #~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
 #~ msgstr ""
-#~ "U heeft besloten om uw systeem bij te werken naar %s. KDE 3.5 is "
-#~ "gevonden\n"
-#~ "op uw systeem. Dit installatieprogramma kan KDE 3.5 niet behouden bij het "
-#~ "opwaarderen. Als u verdergaat, \n"
-#~ "zal KDE 4 KDE 3 vervangen en zult u uw persoonlijke KDE-configuratie "
-#~ "kwijtraken. \n"
-#~ "Om op te waarderen met KDE 3.5 en uw persoonlijke instellingen te "
-#~ "behouden, \n"
-#~ "gelieve uw systeem te herstarten en op te waarderen met behulp van het "
-#~ "Mandriva-herzieningenapplet."
-
-#~ msgid "Proceed"
-#~ msgstr "Doorgaan"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "ophalen van [%s] mislukt"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Bestand %s wordt gedownload…"
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr ""
-#~ "Opwaarderen van een 32-bit naar een 64-bit-distributie wordt niet "
-#~ "ondersteund"
+#~ "Er is geen vrije ruimte voor een \"bootstrap\" van 1MB! De installatie "
+#~ "zal doorgaan, maar om uw systeem op te starten zult u de bootstrap "
+#~ "partitie in DiskDrake moeten creëren."
 
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
 #~ msgstr ""
-#~ "Opwaarderen van een 64-bit naar een 32-bit-distributie wordt niet "
-#~ "ondersteund"
+#~ "U dient een PPC PReP Boot bootstrap aan te maken! Installatie zal verder "
+#~ "gaan, maar om uw systeem op te starten zult u de bootstrappartitie in "
+#~ "DiskDrake moeten creëren."
 
 #~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "U heeft de volgende server(s) geselecteerd: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Deze servers worden standaard geactiveerd. Ze hebben geen bekende\n"
-#~ "veiligheidsproblemen, maar het is mogelijk dat men nieuwe vindt.\n"
-#~ "Zorg er in dat geval voor dat u zo spoedig mogelijk opwaardeert.\n"
-#~ "\n"
-#~ "\n"
-#~ "Weet u zeker dat u deze servers wilt installeren?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "IceWm Desktop"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
 #~ msgstr ""
-#~ "Bezig met verbinden met de mirror om de lijst met beschikbare pakketten "
-#~ "op te halen..."
+#~ "Het heeft er alle schijn van dat u een OldWorld- of Onbekende machine "
+#~ "heeft. De yaboot opstartlader zal voor u niet werken. De installatie zal "
+#~ "doorgaan, maar u zult BootX of een andere methode nodig hebben om uw "
+#~ "machine op te starten. Het argument om aan de kernel mee te geven voor "
+#~ "het root-bestandssysteem is: root=%s"
 
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Verbinden met mirror %s is onmogelijk"
+#~ msgid "Welcome"
+#~ msgstr "Welkom"
 
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Auto-installatiediskette aanmaken"
+#~ msgid "People!"
+#~ msgstr "Mensen!"
 
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "Desgewenst kan de auto-installatie volledig geautomatiseerd worden,\n"
-#~ "in dat geval zal het de harde schijf overnemen!\n"
-#~ "(Deze functie is bedoeld voor het installeren op een andere machine.)\n"
-#~ "\n"
-#~ "Wellicht geeft u de voorkeur aan het herhalen van de installatie.\n"
+#~ msgid "For people"
+#~ msgstr "Voor mensen"
+
+#~ msgid "For contributors"
+#~ msgstr "Voor de gemeenschap"
 
-#~ msgid "Replay"
-#~ msgstr "Herhalen"
+#~ msgid "For you"
+#~ msgstr "Voor u"
 
-#~ msgid "Automated"
-#~ msgstr "Geautomatiseerd"
+#~ msgid "Welcome!"
+#~ msgstr "Welkom!"
 
-#~ msgid "Save packages selection"
-#~ msgstr "Pakketselectie opslaan"
+#~ msgid "Select All"
+#~ msgstr "Alles geselecteerd"
+
+#~ msgid "Bad package"
+#~ msgstr "Onbruikbaar pakket"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Klaarmaken van opstartlader…"
+
+#~ msgid "Mageia, the new Linux distribution"
+#~ msgstr "Mageia, de nieuwe Linux-distributie"
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Netwerktoepassingen"
diff --git a/perl-install/install/share/po/nn.po b/perl-install/install/share/po/nn.po
index bf4ca4342..85a0540fa 100644
--- a/perl-install/install/share/po/nn.po
+++ b/perl-install/install/share/po/nn.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2010-02-07 16:39+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -16,38 +16,63 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Skrivebordet på ein minnepinne"
+msgid "Join Us!"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Mageia Linux-distribusjonen med 100 %% open kjeldekode"
+msgid "Make it yours!"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Utforsk Linux med Mageia One"
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Kontormaskin"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Eit fullt Mageia Linux-skrivebord – med brukarstøtte"
+msgid "Home entertainment"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: Distribusjonar for alle behov"
+msgid "For kids"
+msgstr ""
 
-#: any.pm:109
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Har du fleire medium?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -60,91 +85,89 @@ msgstr ""
 "\n"
 "Har du fleire installasjonsmedium du ønskjer å bruka?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Nettverk (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Nettverk (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Nettverk (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Adresse til spegelen?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Adresser må starta med «ftp://» eller «http://»."
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "Kontaktar Mageia Linux-nettstaden for oversikt over speglar …"
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Kontaktar %s-nettstaden for oversikt over speglar …"
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Klarte ikkje få kontakt med Mageia Linux-nettstaden for å henta oversikt "
-"over tilgjengelege speglar."
+"Klarte ikkje få kontakt med %s-nettstaden for å henta oversikt over "
+"tilgjengelege speglar."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Vel spegelen du vil installera pakkar frå"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-oppsett"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Skriv inn vertsnamn og mappe til NFD-media"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Manglar vertsnam"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Mappa må begynna med «/»"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Vertsnamn til NFS-montering:"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Katalog"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Tillegg"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -152,23 +175,90 @@ msgid ""
 msgstr ""
 "Finn ikkje pakkelistfila på denne spegelen. Sjå til at adressa er rett."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, fuzzy, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Hopp over alle pakkar frå mediet «%s»"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ser på allereie installerte pakkar …"
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Ser etter pakkar å oppgradera …"
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjernar pakkar for oppgradering …"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -181,87 +271,87 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil fjerna pakkane?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Klarte ikkje lesa fila «%s»"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Desse diskane fekk nye namn:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "«%s» (tidlegare namn: «%s»)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Nettverk"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Vel medium"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fila finst allereie. Vil du skriva over ho?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Nekta løyve"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Ugyldig NFS-namn"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Ugyldig medium: %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Kan ikkje ta skjermbilete før partisjonering"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjermbilete vert tilgjengelege i «%s» etter installeringa er ferdig"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Installering"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Du må òg formatera «%s»"
@@ -285,22 +375,22 @@ msgstr "Koplar til nettverket"
 msgid "Bringing down the network"
 msgstr "Koplar frå nettverket"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Hentar fil. Vent litt …"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "klarte ikkje leggja til medium"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopierer nokre pakkar til harddisken for seinare bruk"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopierer filer"
@@ -330,7 +420,23 @@ msgstr "kjekt å ha"
 msgid "maybe"
 msgstr "kanskje"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Ingen XML-informasjon for mediet «%s». Berre delvis resultat for pakken «%s»."
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Inga skildring"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -339,66 +445,76 @@ msgstr ""
 "Nokre pakkar som %s krev kan ikkje installerast:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Det oppstod ein feil:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Det oppstod ein kritisk feil: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Ikkje spør igjen"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "feil med %d installasjonstransaksjonar"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Feil ved installering av pakkar:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Arbeidstasjon"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontormaskin"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Kontorprogramvare: Teksthandsamarar (OpenOffice.org Writer, Kword), rekneark "
-"(OpenOffice.org Calc, Kspread), PDF-viseprogram, med meir"
+"Kontorprogramvare: Teksthandsamarar (LibreOffice Writer, Kword), rekneark "
+"(LibreOffice Calc, Kspread), PDF-viseprogram, med meir"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Spelmaskin"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Moroprogram: Arkadespel, brettspel, strategispel, med meir"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediemaskin"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Program for vising og redigering av film"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internett-maskin"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -407,205 +523,205 @@ msgstr ""
 "Program for lesing og sending av e-post, deltaking i temagrupper og surfing "
 "på Internett"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Nettverksmaskin (klient)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klientprogramvare for fleire protokollar, som ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Verktøy for enkelt oppsett av datamaskina"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsollverktøy"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Skriveprogram, skal, filverktøy og terminalprogram."
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Utvikling"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Utviklingsbibliotek, program og deklarasjonsfiler for C og C++"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Hjelpetekst"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Bøker og hjelpeoppskrifter for Linux og fri programvare"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base – støtte for tredjepartsprogram"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Vevtenar"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Gruppevare"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab-tenar"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Brannmur/rutar"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internett-portnar"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "E-post og temagrupper"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix e-posttenar og Inn temagruppetenar"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Katalogtenar"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-tenar"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domenenamn og nettverksinformasjonstenar."
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fil- og skrivardeling-tenar"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-tenar, Samba-tenar"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL- og MySQL-databasetenar"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL- og MariaDB-databasetenar"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Vev/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix-e-posttenar"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL- eller MySQL-databasetenar"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL- eller MariaDB-databasetenar"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Nettverkstenar"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-tenar, SMB-tenar, mellomtenar, ssh-tenar"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "Skrivebordsmiljøet KDE, med ei samling tilhøyrande verktøy"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -613,66 +729,126 @@ msgid ""
 msgstr ""
 "Eit grafisk skrivebordsmiljø med brukarvenlege program og skrivebordsverktøy"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE-arbeidsstasjon"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Eit grafisk skrivebordsmiljø med brukarvenlege program og skrivebordsverktøy"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME-arbeidsstasjon"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Arbeidstasjon"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Grafisk miljø"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "LXDE-skrivebord"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Eit kjapt og lite ressurskrevande grafisk skrivebordsmiljø med brukarvenlege "
+"program og skrivebordsverktøy"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-skrivebord"
 
-#: share/meta-task/compssUsers.pl:146
-#, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Eit kjapt og lite ressurskrevande grafisk skrivebordsmiljø med brukarvenlege "
 "program og skrivebordsverktøy"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Sjølvvalt skrivebord"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "Skrivebordsmiljøet KDE, med ei samling tilhøyrande verktøy"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andre grafiske skrivebord"
 
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:200
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, med fleire"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Verktøy"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-tenar"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin-fjernoppsettenar"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Nettverksverktøy og -overvaking"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Overvakingsverktøy, prosesshandsaming, tcpdump, nmap, med meir"
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia-vegvisarar"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Vegvisarar for tenaroppsett"
@@ -685,7 +861,7 @@ msgid ""
 msgstr "Det oppstod ein kritisk feil. Hald fram på eige ansvar."
 
 # skip-rule: passiv
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -705,253 +881,252 @@ msgstr "Køyrer steg «%s»\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux-installering %s"
+msgid "%s Installation %s"
+msgstr "%s-installering %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "«Tab»/«Alt + Tab» mellom element"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "X.Org-tenaren tek tid å starta. Vent litt …"
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Du har lite systemressursar, og kan få vanskar med å installera Mageia "
-"Linux.\n"
+"Du har lite systemressursar, og kan få vanskar med å installera %s Linux.\n"
 "Du kan då installera i tekstmodus i staden for. Trykk «F1» ved oppstart av\n"
 "CD-plata, og skriv «text» om du ønskjer dette."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Installer Mageia KDE-skrivebord"
+msgid "Media Selection"
+msgstr "Medieval"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Installer Mageia GNOME-skrivebord"
+msgid "Install %s KDE Desktop"
+msgstr "Installer %s KDE-skrivebord"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Installer %s GNOME-skrivebord"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Anna installering"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE-skrivebord"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME-skrivebord"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Sjølvvalt skrivebord"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Slik ser skrivebordsmiljøet %s ut."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Trykk på bileta for å forstørra dei"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pakkegruppeval"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Direkte pakkeval"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Totalstorleik: %d / %d MiB"
+msgid "Unselect All"
+msgstr "Valde vekk alle"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Ugyldig pakke"
+msgid "Total size: %d / %d MB"
+msgstr "Totalstorleik: %d / %d MiB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versjon: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Storleik: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KiB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Prioritet: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Du kan ikkje velja eller fjerna denne pakken"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "på grunn av manglande «%s»"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "då «%s» ikkje er tilfredsstilt"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "Prøver å prioritera «%s»"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "for å kunna behalda «%s»"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Du kan ikkje velja denne pakken, då det ikkje er nok ledig plass til å "
 "installera han."
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Desse pakkane vert installerte"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Desse pakkane vert fjerna"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Dette er ein obligatorisk pakke. Du kan ikkje velja han vekk."
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Du kan ikkje velja vekk denne pakken, då han allereie er installert."
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Kan ikkje velja vekk pakken. Han må oppgraderast."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Vis automatiske valde pakkar"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Installer"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Opna/lagra utval"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Oppdaterer pakkeval"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal installering"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Programvarehandsaming"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Vel pakkane du ønskjer å installera"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installerer"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Gøym detaljar"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Tid igjen:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(estimerer …)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakke"
 msgstr[1] "%d pakkar"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Samandrag"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Set opp"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "ikkje sett opp"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Medieval"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -960,12 +1135,12 @@ msgstr ""
 "Fann desse installasjonsmedia.\n"
 "Om du ikkje ønskjer å bruka alle, kan du velja vekk dei du ikkje treng no."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Du kan velja å kopiera innhaldet på CD-ane til harddisken før "
@@ -973,72 +1148,72 @@ msgstr ""
 "Installasjonen vil då helda fram frå harddisken, og pakkane vil vera lett "
 "tilgjengeleg òg etter at systemet er installert og sett opp."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopier CD-ane"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Det oppstod ein feil"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Vel tastaturoppsett"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Her er heile lista over tastaturoppsett:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installer/oppgrader"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Vil du installera eller oppgradera?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installer"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Oppgrader «%s»"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Krypteringsnøkkel for «%s»"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Avbryt installering og start systemet på nytt"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Nyinstallering"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Oppgrader førre installasjon (ikkje tilrådd)"
 
-#: steps_interactive.pm:211
-#, c-format
+#: steps_interactive.pm:223
+#, fuzzy, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1046,45 +1221,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Installasjonsprogrammet har oppdaga at den gamle utgåva av Mageia Linux som "
-"du har installert ikkje kan trygt oppgraderast til %s.\n"
+"Installasjonsprogrammet har oppdaga at den gamle utgåva av Mageia som du har "
+"installert ikkje kan trygt oppgraderast til %s.\n"
 "\n"
 "Du bør velja ei nyinstallering, som då vil erstatta den gamle versjonen.\n"
 "\n"
 "Åtvaring: Du bør ta reservekopi av alle personlege data før du vel "
 "«Nyinstallering»."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Set opp IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Ikkje nok ledig plass for oppstartslastar på 1 MiB. Installasjonen held "
-"fram, men du må sjølv laga ein oppstartslastarpartisjon i DiskDrake."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Du må laga ein PPC PReP Boot-bootstrap. Installasjonen vil helda fram, men "
-"viss du vil starta systemet, må du først laga bootstrap-partisjonen i "
-"DiskDrake."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1097,12 +1252,12 @@ msgstr ""
 "Set inn plata merkt «%s» og trykk «OK».\n"
 "Trykk eventuelt «Avbryt» om du ikkje har denne plata."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Ser etter tilgjengelege pakkar …"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1111,7 +1266,7 @@ msgstr ""
 "Maskina di har ikkje nok ledig plass for installering eller oppgradering (%d "
 "MB > %d MB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1120,52 +1275,52 @@ msgstr ""
 "Vel å lagra eller henta pakkeval.\n"
 "Formatet er likt det laga av «auto_install»."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Last"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Lagra"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Ugyldig fil"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Skrivebordsval"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Du kan velja skrivebordsmiljø."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valt storleik er større enn tilgjengeleg plass"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Installasjonstype"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1174,87 +1329,111 @@ msgstr ""
 "Du har ikkje valt noko pakkegruppe.\n"
 "Vel kva type minimal installasjon du vil ha:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: steps_interactive.pm:583
-#, c-format
-msgid "Install suggested packages"
+#: steps_interactive.pm:579
+#, fuzzy, c-format
+msgid "Install recommended packages"
 msgstr "Installer foreslåtte pakkar"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med grunnleggjande hjelpetekstar (tilrådd)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Heilt minimal (òg utan urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Førebur oppstartslastar …"
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Førebur installasjon"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakken «%s»"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Det oppstod ein feil ved sortering av pakkar:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Vil du helda fram likevel?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Prøv på nytt"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Hopp over denne pakken"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Hopp over alle pakkar frå mediet «%s»"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "GÃ¥ tilbake til medie- og pakkevalskjermen"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Det oppstod ein feil ved installering av pakken «%s»."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Oppsett etter installering"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Sjå til at oppdateringsmediet er i stasjon %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Oppdateringar"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1277,28 +1456,29 @@ msgstr ""
 "\n"
 "Ønskjer du å installera oppdateringane?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du eit ISA-lydkort?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1306,82 +1486,70 @@ msgid ""
 msgstr ""
 "Køyr «sndconfig» etter installasjonen er ferdig for å setja opp lydkortet."
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Fann ingen lydkort. Køyr «harddrake» etter installasjonen er ferdig."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grensesnitt"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Nettverk og Internett"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Mellomtenarar"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "oppsett"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Tryggleiksnivå"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "påslått"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "avslått"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Du har ikkje sett opp det grafiske grensesnittet. Er du sikker på at du "
 "ikkje vil ha det?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Førebur oppstartslastar …"
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Førebur installasjon"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Ver tålmodig. Dette kan ta ei stund …"
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Oppstartslastaren yaboot vil ikkje fungera, då du har ei OldWorld- eller ei "
-"ukjend maskin. Installeringa vil helda fram, men du må bruka BootX eller ein "
-"annan måte å starta maskina di på. Kjerneargumentet for rotfilsystemet er: "
-"root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1390,17 +1558,17 @@ msgstr ""
 "Med dette tryggleiksnivået er det berre administratoren som får tilgang til "
 "filer på Windows-partisjonen."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Set inn ein tom diskett i stasjon «%s»"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Lagar diskett for automatisk installasjon …"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1411,12 +1579,12 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil avslutta?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulerer"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Start på nytt"
@@ -1511,13 +1679,6 @@ msgid ""
 "Users"
 msgstr "Brukarar"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Nettverk"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1560,6 +1721,80 @@ msgid ""
 "Exit"
 msgstr "Avslutt"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Førebur oppstartslastar …"
+
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Eit kjapt og lite ressurskrevande grafisk skrivebordsmiljø med "
+#~ "brukarvenlege program og skrivebordsverktøy"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Sjølvvalt skrivebord"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "Ikkje nok ledig plass for oppstartslastar på 1 MiB. Installasjonen held "
+#~ "fram, men du må sjølv laga ein oppstartslastarpartisjon i DiskDrake."
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "Du må laga ein PPC PReP Boot-bootstrap. Installasjonen vil helda fram, "
+#~ "men viss du vil starta systemet, må du først laga bootstrap-partisjonen i "
+#~ "DiskDrake."
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Oppstartslastaren yaboot vil ikkje fungera, då du har ei OldWorld- eller "
+#~ "ei ukjend maskin. Installeringa vil helda fram, men du må bruka BootX "
+#~ "eller ein annan måte å starta maskina di på. Kjerneargumentet for "
+#~ "rotfilsystemet er: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Velkommen"
+
+#~ msgid "Select All"
+#~ msgstr "Valde alle"
+
+#~ msgid "Bad package"
+#~ msgstr "Ugyldig pakke"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Førebur oppstartslastar …"
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Nettverk"
+
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Skrivebordet på ein minnepinne"
+
+#~ msgid "The 100%% open source Mageia distribution"
+#~ msgstr "Mageia-distribusjonen med 100 %% open kjeldekode"
+
+#~ msgid "Explore Linux easily with Mageia One"
+#~ msgstr "Utforsk Linux med Mageia One"
+
+#~ msgid "A full Mageia desktop, with support"
+#~ msgstr "Eit fullt Mageia-skrivebord – med brukarstøtte"
+
+#~ msgid "Mageia: distributions for everybody's needs"
+#~ msgstr "Mageia: Distribusjonar for alle behov"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1640,7 +1875,7 @@ msgstr "Avslutt"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/pa_IN.po b/perl-install/install/share/po/pa_IN.po
index 4865ceede..5107fb88a 100644
--- a/perl-install/install/share/po/pa_IN.po
+++ b/perl-install/install/share/po/pa_IN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2005-03-27 17:55+0530\n"
 "Last-Translator: Jaswinder Singh Phulewala <jaswinderphulewala@yahoo.com>\n"
 "Language-Team: Punjabi <punlinux-i18n@lists.soruceforge.net>\n"
@@ -19,38 +19,63 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "ਦਫਤਰ ਵਰਕਸਟੇਸ਼ਨ"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Thank you!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Be Free!"
 msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "ਕੀ ਤ�ਹਾਡੇ ਕੋਲ ਅੱਗੇ ਅਨ�ਪੂਰਕ ਮਾਧਿਅਮ ਹੈ?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -59,112 +84,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "ਨੈੱਟਵਰਕ (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "ਨੈੱਟਵਰਕ (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "ਪ�ਰਤਿਬਿੰਬ ਦਾ URL?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
-#, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+#: any.pm:248
+#, fuzzy, c-format
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "ਉਪਲੱਬਧ ਪ�ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..."
 
-#: any.pm:187
+#: any.pm:253
 #, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr "ਉਪਲੱਬਧ ਪ�ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "ਪੈਕੇਜ ਪ�ਰਾਪਤ ਕਰਨ ਲਈ ਪ�ਰਤੀਬਿੰਬ ਚ�ਣੋ"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "ਇਸ ਪ�ਰਤੀਬਿੰਬ ਤੇ ਪੈਕੇਜ ਸੂਚੀ ਫਾਇਲ ਨਹੀਂ ਲੱਭ ਸਕੀ। ਜਾਂਚ ਕਰੋ ਕਿ ਸਥਿਤੀ ਠੀਕ ਹੈ।"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "ਪਹਿਲਾਂ ਇੰਸਟਾਲ ਕੀਤੇ ਪੈਕੇਜਾਂ ਸੀ ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "ਨਵੀਨੀਕਰਨ ਲਈ ਪੈਕੇਜਾਂ ਦੀ ਖੋਜ..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -177,87 +267,87 @@ msgstr ""
 "\n"
 "ਕੀ ਤ�ਸੀਂ ਯਕੀਨਨ ਇਹ ਪੈਕੇਜ ਹਟਾਉਣੇ ਚਾਹ�ੰਦੇ ਹੋ?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "ਫਾਇਲ %s ਪੜਨ ਵਿੱਚ ਗਲਤੀ"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "ਹੇਠਲੀਆਂ ਡਿਸਕਾਂ ਦੇ ਨਾਂ ਤਬਦੀਲ ਕੀਤੇ ਹਨ:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (ਪਹਿਲਾਂ %s ਨਾਂ ਸੀ)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, fuzzy, c-format
 msgid "FTP"
 msgstr "ਵੈਬ/FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "PFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "ਨੈੱਟਵਰਕ"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਬੈਕਅੱਪ ਲਈ ਮਾਧਿਅਮ ਚ�ਣੋ।"
 
-#: any.pm:1118
+#: any.pm:1402
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "ਫਾਇਲ ਪਹਿਲਾਂ ਮੌਜੂਦ ਹੈ, ਇਹ ਵਰਤੋ?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, fuzzy, c-format
 msgid "Permission denied"
 msgstr "ਅਧਿਕਾਰ"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr ""
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "ਵਿਭਾਗੀਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਰਦਾ-ਤਸਵੀਰ ਨਹੀਂ ਬਣਾ ਸਕਦਾ"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "ਪਰਦਾ-ਤਸਵੀਰਾਂ %s ਵਿੱਚ ਇੰਸਟਾਲੇਸ਼ਨ ਤੋਂ ਬਾਅਦ ਉਪਲੱਬਧ ਹੋਣਗੀਆਂ"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "ਇੰਸਟਾਲ ਹੋ ਰਹੇ ਹਨ"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "ਸੰਰਚਨਾ"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "ਤ�ਹਾਨੂੰ %s ਵੀ ਫਾਰਮਿਟ ਕਰਨਾ ਜਰੂਰੀ ਹੈ"
@@ -281,22 +371,22 @@ msgstr "ਨੈੱਟਵਰਕ ਚਲਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgid "Bringing down the network"
 msgstr "ਨੈੱਟਵਰਕ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "ਨਕਲ ਜਾਰੀ ਹੈ"
@@ -326,342 +416,424 @@ msgstr "ਵਧੀਆ"
 msgid "maybe"
 msgstr "ਹੋ ਸਕਦਾ ਹੈ"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "ਕੋਈ ਵੇਰਵਾ ਨਹੀ"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "ਘਾਤਕ ਗਲਤੀ ਆਈ: %s"
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੋ ਰਹੀ ਹੈ"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "ਵਰਕਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "ਦਫਤਰ ਵਰਕਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"ਦਫਤਰੀ ਪ�ਰੋਗਰਾਮ: ਅੱਖਰਕਾਰ (OpenOffice.org Writer, Kword), ਸਾਰਣੀਕਾਰ (OpenOffice."
-"org Calc, Kspread), PDF ਦਰਸ਼ਕ, ਆਦਿ"
+"ਦਫਤਰੀ ਪ�ਰੋਗਰਾਮ: ਅੱਖਰਕਾਰ (LibreOffice Writer, Kword), ਸਾਰਣੀਕਾਰ (OpenOffice.org "
+"Calc, Kspread), PDF ਦਰਸ਼ਕ, ਆਦਿ"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "ਖੇਡ ਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "ਮਨੋਰੰਜਨ ਪ�ਰੋਗਰਾਮ: ਆਰਕੇਡ, ਬੋਰਡ, ਨੀਤੀ, ਆਦਿ"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "ਮਲਟੀਮੀਡੀਆ ਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "ਸਾਊਂਡ ਅਤੇ ਵੀਡੀਓ ਚਲਾਉਣ/ਸੋਧਣ ਵਾਲੇ ਪ�ਰੋਗਰਾਮ"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "ਇੰਟਰਨੈੱਟ ਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "ਪੱਤਰ ਅਤੇ ਖਬਰਾਂ ਪੜਨ ਅਤੇ ਭੇਜਣ ਲਈ (mutt, tin..) ਅਤੇ ਵੈਬ �ਾਤੀ ਲਈ ਸੰਦਾਂ ਦਾ ਸਮੂਹ"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "ਨੈੱਟਵਰਕ ਕੰਪਿਊਟਰ (ਕਲਾਂਈਟ)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "ssh ਸਮੇਤ ਵੱਖ-ਵੱਖ ਪਰੋਟੋਕਾਲਾਂ ਲਈ ਕਲਾਂਈਟ"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਦੀ ਸੰਰਚਨਾ ਸਾਫ ਕਰਨ ਲਈ ਸੰਦ"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "ਕੰਸੋਲ ਸੰਦ"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "ਵਿਕਾਸ"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "ਦਸਤਾਵੇਜ਼"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "ਲੀਨਕਸ ਅਤੇ ਮ�ਕਤ ਸਾਫਟਵੇਅਰ ਉੱਪਰ ਕਿਤਾਬਾਂ ਅਤੇ Howto's"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "ਲੀਨਕਸ ਮਿਆਰੀ ਮ�ੱਢ। ਤੀਜੀ ਪਾਰਟੀ ਕਾਰਜ ਸਹਿਯੋਗ"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "ਵੈਬ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "ਗਰ�ੱਪਵੇਅਰ"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "ਫਾਇਲਵਾਲ/ਰਾਊਟਰ"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "ਇੰਟਰਨੈੱਟ ਗੇਟਵੇ"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "ਪੱਤਰ/ਖਬਰ"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix ਪੱਤਰ ਸਰਵਰ, Inn ਖਬਰ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "ਡੋਮੇਨ ਨਾਂ ਅਤੇ ਨੈੱਟਵਰਕ ਜਾਣਕਾਰੀ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "ਫਾਇਲ ਅਤੇ ਪ�ਰਿੰਟਰ ਸ਼ੇਅਰਿੰਗ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "ਡਾਟਾਬੇਸ "
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL ਅਤੇ MySQL ਡਾਟਾਬੇਸ ਸਰਵਰ"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL ਅਤੇ MariaDB ਡਾਟਾਬੇਸ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "ਵੈਬ/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix ਪੱਤਰ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ਜਾਂ MySQL ਡਾਟਾਬੇਸ ਸਰਵਰ"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL ਜਾਂ MariaDB ਡਾਟਾਬੇਸ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "ਨੈੱਟਵਰਕ ਕੰਪਿਊਟਰ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "ਕੇ ਡੀ ਈ ਵਰਕਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "ਗਨੋਮ ਵਰਕਸਟੇਸ਼ਨ"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, 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:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "ਕੇ ਡੀ ਈ ਵਰਕਸਟੇਸ਼ਨ"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr "ਉਪਭੋਗੀ-ਅਨ�ਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "ਗਨੋਮ ਵਰਕਸਟੇਸ਼ਨ"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "ਵਰਕਸਟੇਸ਼ਨ"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "ਵਿਹੜਾ"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "ਉਪਭੋਗੀ-ਅਨ�ਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "ਵਿਹੜਾ"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "ਉਪਭੋਗੀ-ਅਨ�ਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
+
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "ਵਿਹੜਾ"
+
+#: share/meta-task/compssUsers.pl:195
 #, fuzzy, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr "ਉਪਭੋਗੀ-ਅਨ�ਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "ਕੇ ਵਿਹੜਾ ਵਾਤਾਵਰਨ, ਸਾਥੀ ਸੰਦਾਂ ਦੇ ਭੰਡਾਰ ਨਾਲ ਮ�ੱਢਲਾ ਗਰਾਫਿਕਲ ਵਾਤਾਵਰਨ"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "ਹੋਰ ਗਰਾਫੀਕਲ ਵਿਹੜੇ"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, c-format
 msgid "Utilities"
 msgstr "ਸਹੂਲਤਾਂ"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin ਰਿਮੋਟ ਸੰਰਚਨਾ ਸਰਵਰ"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "ਨੈੱਟਵਰਕ ਸਹੂਲਤਾਂ/ਪ�ਰਬੰਧਨ"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "ਪ�ਰਬੰਧਨ ਸੰਦ, ਕਾਰਜ ਅਕਾਊਂਟਿੰਗ, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "ਮੈਂਡਰਿਵ-ਸਾਫਟ ਤਖਤੀ"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "ਸਰਵਰ ਸੰਰਚਨਾ ਲਈ ਤਖਤੀ"
@@ -675,7 +847,7 @@ msgstr ""
 "ਗਲਤੀ ਹੋਈ ਹੈ, ਪਰ ਮੈਂ ਨਹੀਂ ਜਾਣਦਾ ਕਿ ਇਸ ਦਾ ਕਿਸ ਤਰਾਂ ਪ�ਰਬੰਧਨ ਕਰਨਾ ਹੈ।\n"
 "ਆਪਣੇ ਖਤਰੇ ਤੇ ਜਾਰੀ ਕਰੋ।"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -693,8 +865,8 @@ msgid "Entering step `%s'\n"
 msgstr "ਪਗ਼ `%s' ਸ਼�ਰੂ ਹੋ ਰਿਹਾ ਹੈ\n"
 
 #: steps_curses.pm:22
-#, c-format
-msgid "Mageia Linux Installation %s"
+#, fuzzy, c-format
+msgid "%s Installation %s"
 msgstr "ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਇੰਸਟਾਲੇਸ਼ਨ %s "
 
 #: steps_curses.pm:32
@@ -702,242 +874,242 @@ msgstr "ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਇੰਸਟਾਲੇਸ਼ਨ %s "
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> ਇਕਾਈਆਂ ਵਿੱਚ "
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
-#, c-format
+#: steps_gtk.pm:212
+#, fuzzy, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "ਤ�ਹਾਡੇ ਸਿਸਟਮ ਤੇ ਸਰੋਤ ਘੱਟ ਹਨ। ਤ�ਹਾਨੂੰ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਇੰਸਟਾਲ ਕਰਨ ਸਮੇਂ ਮ�ਸ਼ਕਿਲ\n"
 "ਆ ਸਕਦੀ ਹੈ। ਜੇ ਅਜਿਹਾ ਹੋਇਆ, ਤ�ਸੀਂ ਪਾਠ ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਇਸ ਲਈ,\n"
 "`F1' ਦਬਾਓ ਜਦੋਂ CDROM ਤੋਂ ਬੂਟ ਕਰਦੇ ਹੋ, ਫਿਰ `ਪਾਠ' ਭਰੋ।"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "ਪੈਕੇਜ ਸਮੂਹ ਚੋਣ"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "ਘੱਟੋ-ਘੱਟ ਇੰਸਟਾਲ"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "ਵਿਹੜਾ"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "ਵਿਹੜਾ"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "ਵਿਹੜਾ"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "ਪੈਕੇਜ ਸਮੂਹ ਚੋਣ"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "ਵੱਖ-ਵੱਖ ਪੈਕੇਜ ਚੋਣ"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "ਕ�ੱਲ ਅਕਾਰ: %d / %d ਮੈਬਾ"
+msgid "Unselect All"
+msgstr "ਸਭ ਨਾ-ਚ�ਣੋ"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "ਗਲਤ ਪੈਕੇਜ"
+msgid "Total size: %d / %d MB"
+msgstr "ਕ�ੱਲ ਅਕਾਰ: %d / %d ਮੈਬਾ"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "ਵਰਜਨ:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "ਅਕਾਰ:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d ਕਿਬਾ\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "ਖਾਸੀਅਤ:"
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "ਤ�ਸੀਂ ਇਹ ਪੈਕੇਜ ਚ�ਣ/ਨਾ-ਚ�ਣ ਨਹੀਂ ਸਕਦੇ"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s ਗ�ੰਮ ਹੋਣ ਕਾਰਨ"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s ਲੋੜ ਪੂਰੀ ਨਾ ਹੋਣ ਕਰਕੇ"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s ਵਰਤੋਂ ਦੀ ਸਿਫਾਰਸ਼ ਕੀਤੀ ਜਾਂਦੀ ਹੈ"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s ਰੱਖਣ ਲਈ"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "ਤ�ਸੀਂ ਇਹ ਪੈਕੇਜ ਨਹੀਂ ਚ�ਣ ਸਕਦੇ ਕਿਉਂਕਿ ਇੱਥੇ ਇਸ ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਲੋੜੀਂਦੀ ਥਾਂ ਨਹੀਂ ਹੈ।"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "ਹੇਠਲੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੋ ਰਹੇ ਹਨ"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "ਹੇਠਲੇ ਪੈਕੇਜ ਹਟਾ� ਜਾ ਰਹੇ ਹਨ"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "ਇਹ ਲਾਜ਼ਮੀ ਪੈਕੇਜ ਹੈ, ਇਸ ਦੀ ਚੋਣ ਨਹੀਂ ਹਟਾਈ ਜਾ ਸਕਦੀ"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "ਤ�ਸੀਂ ਇਸ ਪੈਕੇਜ ਦੀ ਚੋਣ ਨਹੀਂ ਹਟਾ ਸਕਦੇ। ਇਹ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ।"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "ਤ�ਸੀਂ ਇਸ ਪੈਕੇਜ ਦੀ ਚੋਣ ਨਹੀਂ ਹਟਾ ਸਕਦੇ। ਇਸ ਦਾ ਨਵੀਨੀਕਰਨ ਜਰੂਰੀ ਹੈ।"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "ਚ�ਣੇ ਪੈਕੇਜ ਸਵੈ ਹੀ ਵਿਖਾਓ"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "ਇੰਸਟਾਲ"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "ਪੈਕੇਜ ਚੋਣ"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "ਪੈਕੇਜ ਚੋਣ ਨਵੀਨੀਕਰਨ ਜਾਰੀ ਹੈ"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "ਘੱਟੋ-ਘੱਟ ਇੰਸਟਾਲ"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "ਸਾਫਟਵੇਅਰ ਪ�ਰਬੰਧਨ"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ ਚ�ਣੋ"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "ਇੰਸਟਾਲ ਹੋ ਰਹੇ ਹਨ"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "ਕੋਈ ਵੇਰਵਾ ਨਹੀਂ"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "ਬਾਕੀ ਸਮਾਂ"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "ਅਨ�ਮਾਨ ਜਾਰੀ ਹੈ"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d ਪੈਕੇਜ"
 msgstr[1] "%d ਪੈਕੇਜ"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "ਸਾਰ"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "ਸੰਰਚਨਾ"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "ਸੰਰਚਿਤ ਨਹੀਂ"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "ਪੈਕੇਜ ਸਮੂਹ ਚੋਣ"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -946,84 +1118,84 @@ msgstr ""
 "ਹੇਠਲੇ ਇੰਸਟਾਲੇਸ਼ਨ ਮਾਧਿਅਨ ਲੱਭੇ ਹਨ।\n"
 "ਜੇ ਤ�ਸੀਂ ਇਹਨਾਂ ਵਿੱਚੋਂ ਕ�� ਛੱਡਣੇ ਚਾਹ�ੰਦੇ ਹੋ, ਤ�ਸੀਂ ਹ�ਣ ਰੱਦ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "ਤ�ਹਾਡੇ ਕੋਲ ਇੰਸਟਾਲੇਸ਼ਨ ਤੋਂ ਪਹਿਲਾਂ CDs ਦੇ ਸੰਖੇਪ ਹਾਰਡ ਡਰਾਈਵ ਤੇ ਨਕਲ ਕਰਨ ਦੀ ਚੋਣ ਹੈ।\n"
 "ਇਹ ਫਿਰ ਹਾਰਡ ਡਰਾਈਵ ਤੋਂ ਜਾਰੀ ਕਰੇਗਾ ਅਤੇ ਪੈਕੇਜ ਸਿਸਟਮ ਪੂਰੀ ਤਰਾਂ ਇੰਸਟਾਲ ਹੋਣ ਤੋਂ ਬਾਅਦ ਵੀ ਉਪਲੱਬਧ "
 "ਰਹਿਣਗੇ।"
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "ਪੂਰੀ CDs ਨਕਲ ਕਰੋ"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਕੀਬੋਰਡ ਖਾਕਾ ਚ�ਣੋ।"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "ਇੱਥੇ ਉਪਲੱਬਧ ਕੀਬੋਰਡਾਂ ਦੀ ਸੂਚੀ ਹੈ"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "ਇੰਸਟਾਲ/ਨਵੀਨੀਕਰਨ"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "ਕੀ ਇਹ ਇੰਸਟਾਲ ਜਾਂ ਨਵੀਨੀਕਰਨ ਹੈ?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "ਇੰਸਟਾਲ"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "ਨਵੀਨੀਕਰਨ %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s ਲਈ ਇਨਕ�ਰਿਪਸ਼ਨ ਕ�ੰਜੀ"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "ਇੰਸਟਾਲ ਹੋ ਰਹੇ ਹਨ"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1032,36 +1204,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE ਸੰਰਚਨਾ ਹੋ ਰਹੀ ਹੈ"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"1ਮੈਬਾ ਬੂਟਸਟਰੈਪ ਲਈ ਕੋਈ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ! ਇੰਸਟਾਲ ਜਾਰੀ ਰਹੇਗੀ, ਪਰ ਤ�ਹਾਡਾ ਸਿਸਟਮ ਬੂਟ ਕਰਨ ਲਈ, "
-"ਤ�ਹਾਨੂੰ DiskDrake ਵਿੱਚ ਬੂਟਸਟਰੈਪ ਭਾਗ ਬਣਾਉਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"PPC PReP Boot ਬੂਟਸਟਰੈਪ ਲਈ ਕੋਈ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ! ਇੰਸਟਾਲ ਜਾਰੀ ਰਹੇਗੀ, ਪਰ ਤ�ਹਾਡਾ ਸਿਸਟਮ ਬੂਟ "
-"ਕਰਨ ਲਈ, ਤ�ਹਾਨੂੰ DiskDrake ਵਿੱਚ ਬੂਟਸਟਰੈਪ ਭਾਗ ਬਣਾਉਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1073,19 +1226,19 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ \"%s\" ਲੇਬਲ ਵਾਲੀ Cd-Rom ਆਪਣੀ ਡਰਾਈਵ ਵਿੱਚ ਪਾਓ ਅਤੇ ਸਮਾਪਤੀ ਤੇ ਠੀਕ ਹੈ ਦਬਾਓ\n"
 "ਜੇ ਤ�ਹਾਡੇ ਕੋਲ ਇਹ ਨਹੀਂ ਹੈ, ਇਸ Cd-Rom ਤੋਂ ਇੰਸਟਾਲੇਸ਼ਨ ਰੋਕਣ ਲਈ ਰੱਦ ਕਰੋ ਦਬਾਓ।"
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1094,52 +1247,52 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਫਲਾਪੀ ਤੇ ਪੈਕੇਜ ਲੋਡ ਜਾਂ ਸੰਭਾਲ ਚ�ਣੋ।\n"
 "ਫਾਰਮਿਟ ਫਲਾਪੀਆਂ ਦ�ਆਰਾ ਬਣਾ� auto_install ਵਾਂਗ ਹੈ।"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, fuzzy, c-format
 msgid "Load"
 msgstr "ਪੋਲੈਂਡ"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "ਅਸਲੀ ਫਾਇਲ"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "ਗਨੋਮ"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "ਪੈਕੇਜ ਸਮੂਹ ਚੋਣ"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "ਚ�ਣਿਆ ਅਕਾਰ ਉਪਲੱਬਧ ਥਾਂ ਨਾਲੋਂ ਜਿਆਦਾ ਹੈ"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "ਇੰਸਟਾਲ ਦੀ ਕਿਸਮ"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1148,87 +1301,111 @@ msgstr ""
 "ਤ�ਸੀਂ ਪੈਕੇਜਾਂ ਦਾ ਕੋਈ ਸਮੂਹ ਨਹੀਂ ਚ�ਣਿਆ।\n"
 "ਕਿਰਪਾ ਕਰਕੇ ਘੱਟੋ-ਘੱਟ ਇੰਸਟਾਲੇਸ਼ਨ ਚ�ਣੋ:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X ਨਾਲ"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੋ ਰਹੀ ਹੈ"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "ਮ�ੱਢਲੀ ਦਸਤਾਵੇਜ਼ੀ ਨਾਲ (ਸਿਫਾਰਸ਼ੀ)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "ਯਕੀਨਨ ਘੱਟੋ-ਘੱਟ ਇੰਸਟਾਲ (ਖਾਸ ਤੌਰ ਤੇ urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "ਬੂਟ-ਲੋਡਰ ਤਿਆਰ ਕਰ ਰਿਹਾ ਹੈ..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਤਿਆਰੀ ਹੋ ਰਹੀ ਹੈ"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੋ ਰਹੀ ਹੈ"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "ਪੈਕੇਜ ਕ�ਰਮਬੱਧ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "ਕਿਸੇ ਤਰਾਂ ਜਾਰੀ ਰੱਖੋ?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "ਮ�ੜ-ਪ�ਰਾਪਤ"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "ਪੈਕੇਜ ਚੋਣ ਸੰਭਾਲੋ"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "ਪੋਸਟ-ਇੰਸਟਾਲ ਸੰਰਚਨਾ"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "ਨਵਿਨੀਕਰਨ"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1241,124 +1418,114 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s, %s ਉੱਪਰ"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "ਜੰਤਰ"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "ਸਾਊਂਡ ਕਾਰਡ"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "ਕੀ ਤ�ਹਾਡੇ ਕੋਲ ISA ਸਾਊਂਡ ਕਾਰਡ ਹੈ?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "ਆਪਣੀ ਸਾਊਂਡ ਕਾਰਡ ਸੰਰਚਨਾ ਲਈ ਇੰਸਟਾਲੇਸ਼ਨ ਮਗਰੋਂ \"alsaconf\" ਜਾਂ \"sndconfig\" ਚਲਾਓ"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "ਕੋਈ ਸਾਊਂਡ ਕਾਰਡ ਨਹੀਂ ਲੱਭਿਆ। ਇੰਸਟਾਲੇਸ਼ਨ ਮਗਰੋਂ \"harddrake\" ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "ਗਰਾਫੀਕਲ ਇੰਟਰਫੇਸ"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "ਨੈੱਟਵਰਕ ਤੇ ਇੰਟਰਨੈੱਟ"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "ਪਰਾਕਸੀ"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "ਸੰਰਚਿਤ"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "ਸ�ਰੱਖਿਆ ਪੱਧਰ"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "ਫਾਇਰਵਾਲ"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "ਸਰਗਰਮ"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "ਅਯੋਗ"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "ਤ�ਸੀਂ X ਸੰਰਚਿਤ ਨਹੀਂ ਕੀਤਾ। ਕੀ ਤ�ਸੀਂ ਯਕੀਨਨ ਇਸ ਨੂੰ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "ਬੂਟ-ਲੋਡਰ ਤਿਆਰ ਕਰ ਰਿਹਾ ਹੈ..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਤਿਆਰੀ ਹੋ ਰਹੀ ਹੈ"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"ਤ�ਹਾਡੇ ਕੋਲ ਓਲਡਵਰਡ ਜਾਂ ਅਣਪਛਾਤੀ ਮਸ਼ੀਨ ਲੱਗਦੀ ਹੈ, yaboot ਤ�ਹਾਡੇ ਲਈ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ। ਇੰਸਟਾਲ "
-"ਜਾਰੀ ਰਹੇਗਾ, ਪਰ ਤ�ਹਾਨੂੰ ਆਪਣੀ ਮਸ਼ੀਨ ਬੂਟ ਕਰਨ ਲਈ BootX ਜਾਂ ਹੋਰ ਢੰਗ ਵਰਤਣ ਦੀ ਲੋੜ ਪਵੇਗੀ। ਰੂਟ "
-"ਫਾਇਲ ਸਿਸਟਮ ਲਈ ਕਰਨਲ ਆਰਗੂਮੈਂਟ ਹਨ: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "ਇਸ ਸ�ਰੱਖਿਆ ਪੱਧਰ ਵਿੱਚ, Windows ਭਾਗ ਵਿਚਲੀ ਫਾਇਲਾਂ ਵਰਤਣ ਲਈ ਪ�ਰਬੰਧਕ ਨੂੰ ਮਨਾਹੀ ਹੈ।"
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "ਡਰਾਈਵ %s ਵਿੱਚ ਖਾਲੀ ਫਲਾਪੀ ਪਾਓ"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "ਸਵੈ ਇੰਸਟਾਲ ਫਲਾਪੀ ਬਣਾ ਰਿਹਾ ਹੈ..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1369,12 +1536,12 @@ msgstr ""
 "\n"
 "ਕੀ ਤ�ਸੀਂ ਹ�ਣ ਯਕੀਨਨ ਬਾਹਰ ਜਾਣਾ ਹੈ?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "ਮ�ਬਾਰਕਾਂ"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "ਮ�ੜ-ਚਾਲੂ"
@@ -1469,13 +1636,6 @@ msgid ""
 "Users"
 msgstr "ਉਪਭੋਗੀ"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "ਨੈਟਵਰਕਿੰਗ"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1518,6 +1678,62 @@ msgid ""
 "Exit"
 msgstr "ਬਾਹਰ"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "ਬੂਟ-ਲੋਡਰ ਤਿਆਰ ਕਰ ਰਿਹਾ ਹੈ..."
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr "ਉਪਭੋਗੀ-ਅਨ�ਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "ਵਿਹੜਾ"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "1ਮੈਬਾ ਬੂਟਸਟਰੈਪ ਲਈ ਕੋਈ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ! ਇੰਸਟਾਲ ਜਾਰੀ ਰਹੇਗੀ, ਪਰ ਤ�ਹਾਡਾ ਸਿਸਟਮ ਬੂਟ ਕਰਨ "
+#~ "ਲਈ, ਤ�ਹਾਨੂੰ DiskDrake ਵਿੱਚ ਬੂਟਸਟਰੈਪ ਭਾਗ ਬਣਾਉਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "PPC PReP Boot ਬੂਟਸਟਰੈਪ ਲਈ ਕੋਈ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ! ਇੰਸਟਾਲ ਜਾਰੀ ਰਹੇਗੀ, ਪਰ ਤ�ਹਾਡਾ ਸਿਸਟਮ "
+#~ "ਬੂਟ ਕਰਨ ਲਈ, ਤ�ਹਾਨੂੰ DiskDrake ਵਿੱਚ ਬੂਟਸਟਰੈਪ ਭਾਗ ਬਣਾਉਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "ਤ�ਹਾਡੇ ਕੋਲ ਓਲਡਵਰਡ ਜਾਂ ਅਣਪਛਾਤੀ ਮਸ਼ੀਨ ਲੱਗਦੀ ਹੈ, yaboot ਤ�ਹਾਡੇ ਲਈ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ। ਇੰਸਟਾਲ "
+#~ "ਜਾਰੀ ਰਹੇਗਾ, ਪਰ ਤ�ਹਾਨੂੰ ਆਪਣੀ ਮਸ਼ੀਨ ਬੂਟ ਕਰਨ ਲਈ BootX ਜਾਂ ਹੋਰ ਢੰਗ ਵਰਤਣ ਦੀ ਲੋੜ ਪਵੇਗੀ। ਰੂਟ "
+#~ "ਫਾਇਲ ਸਿਸਟਮ ਲਈ ਕਰਨਲ ਆਰਗੂਮੈਂਟ ਹਨ: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "ਜੀ ਆਇਆਂ ਨੂੰ"
+
+#~ msgid "Select All"
+#~ msgstr "ਸਭ ਚ�ਣੇ"
+
+#~ msgid "Bad package"
+#~ msgstr "ਗਲਤ ਪੈਕੇਜ"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "ਬੂਟ-ਲੋਡਰ ਤਿਆਰ ਕਰ ਰਿਹਾ ਹੈ..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "ਨੈਟਵਰਕਿੰਗ"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1544,7 +1760,7 @@ msgstr "ਬਾਹਰ"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/pl.po b/perl-install/install/share/po/pl.po
index 470231040..ad2968be4 100644
--- a/perl-install/install/share/po/pl.po
+++ b/perl-install/install/share/po/pl.po
@@ -1,67 +1,94 @@
-# translation of DrakX.po to
-# Polish translation file
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# tomek, 2005.
-# Paweł Jabłoński <pj@linux-mandrake.com>, 2001,2002.
-# Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>, 2002-2004.
-# Tomasz Bednarski <bednarski@skrzynka.pl>, 2005.
-# Tomasz Bednarski <tomasz.bednarski@mandriva.pl>, 2005.
-# Maciej Walkowiak <m.walkowiak@computer.org>, 2005.
-# Tomasz Bednarski - Mandriva Poland <tomasz.bednarski@mandriva.pl>, 2006, 2007.
-# Tomasz Bednarski Mandriva Poland <tomasz.bednarski@mandriva.pl>, 2006.
-# Mandriva Poland <biuro@mandriva.pl>, 2006.
-# Tomasz Bednarski - Amazis.net <tomasz.bednarski@amazis.pl>, 2007.
-# Tomasz Bednarski - Amazis.net <tomasz.bednarski@mandriva.pl>, 2008.
-# Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@mandriva.pl>, 2008.
-# Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@amazis.pl>, 2009.
+# Translators:
+# Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@amazis.pl>, 2009
+# Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@mandriva.pl>, 2008
+# Daniel Napora <napcok@gmail.com>, 2013,2015
+# Maciej Walkowiak <m.walkowiak@computer.org>, 2005
+# Mandriva Poland <biuro@mandriva.pl>, 2006
+# Paweł Jabłoński <pj@linux-mandrake.com>, 2001-2002
+# Tomasz Bednarski - Amazis.net <tomasz.bednarski@amazis.pl>, 2007
+# Tomasz Bednarski - Amazis.net <tomasz.bednarski@mandriva.pl>, 2008
+# Tomasz Bednarski <bednarski@skrzynka.pl>, 2005
+# Tomasz Bednarski - Mandriva Poland <tomasz.bednarski@mandriva.pl>, 2006-2007
+# Tomasz Bednarski Mandriva Poland <tomasz.bednarski@mandriva.pl>, 2006
+# Tomasz Bednarski <tomasz.bednarski@mandriva.pl>, 2005
+# tomek, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2010-05-04 09:31+0100\n"
-"Last-Translator: Marek Walczak <kubdat@poczta.fm>\n"
-"Language-Team:  <pl@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 04:07+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/mageia/language/"
+"pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Twój system na kluczu USB"
+msgid "Join Us!"
+msgstr "Dołącz do nas!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "100%% dystrybucja Mageia Linux oparta na open source"
+msgid "Make it yours!"
+msgstr "Uczyń ją swoją!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "W łatwy sposób poznasz Linuksa z Mageia One"
+msgid "Your choice!"
+msgstr "Twój wybór!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "System Mageia Linux, ze wsparciem"
+msgid "Office tools"
+msgstr "Narzędzia biurowe"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: dystrybucja dla wszystkich potrzeb"
+msgid "Home entertainment"
+msgstr "Domowe centrum rozrywki"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Dla dzieci"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Dla rodziny!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Dla developerów!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Dziękujemy!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Bądź wolny!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Czy posiadasz inne dodatkowe nośniki?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -75,91 +102,87 @@ msgstr ""
 "\n"
 "Czy chcesz skonfigurować dodatkowe nośniki instalacyjne?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Sieć (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Sieć (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Sieć (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Adres URL dla serwera zwierciadlanego?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Adres URL musi zaczynać się od ftp:// lub http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"�ączenie ze stroną Mageia Linux w celu pobrania listy dostępnych serwerów..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "�ączenie ze stroną %s w celu pobrania listy dostępnych serwerów..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr ""
-"�ączenie ze stroną Mageia Linux w celu pobrania listy dostępnych serwerów"
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr "�ączenie ze stroną %s w celu pobrania listy dostępnych serwerów"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Wybierz serwer lustrzany, z którego chcesz pobrać pakiety"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Konfiguracja NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Wprowadź nazwę komputera i katalog nośnika NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Brak nazwy hosta"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Oznaczenie katalogu musi się zaczynać od znaku \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Nazwa komputera udostępniające udziały NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Katalog"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Dodatkowe"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -168,23 +191,96 @@ msgstr ""
 "Nie można znaleźć listy pakietów na tym serwerze. Sprawdź poprawność "
 "lokalizacji."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Niektóre urządzenia w twoim komputerze wymagają nie-wolnego firmware, aby "
+"wolne sterowniki mogły działać."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Warto włączyć \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" zawiera różne komponenty systemu oraz aplikacje"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" zawiara nie-wolne oprogramowanie.\n"
+
+#: any.pm:477
+#, 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 ""
+"Zawiera również firmware niezbędne do działania niektórych urządzeń (jak: "
+"niektóre karty ATI/AMD, niektóre karty sieciowe, kontrolery RAID, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" zawiara oprogramowanie, które w niektórych krajach nie może być "
+"dystrybuowane  ze względu na patenty."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "Zawiera również oprogramowanie z \"%s\" "
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Możesz włączyć więcej nośników jeśli chcesz."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Ten nośnik zawiera aktualizacje pakietów dla nośnika \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Wyszukiwanie już zainstalowanych pakietów..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Wyszukiwanie pakietów do uaktualnienia..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Usuwanie pakietów w celu wykonania aktualizacji..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -197,87 +293,87 @@ msgstr ""
 "\n"
 "Czy naprawdę chcesz usunąć te pakiety?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "BÅ‚Ä…d odczytu pliku %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Zmieniono nazwy następujących dysków:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (wcześniejsza nazwa: %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Sieć"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Proszę wybrać nośnik"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Plik już istnieje. Nadpisać?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Dostęp zabroniony"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Niepoprawna nazwa NFS"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Nieprawidłowy nośnik %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Nie można pobrać zrzutu ekranu przed partycjonowaniem"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Zrzuty ekranu będą dostępne po instalacji w %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalacja"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Należy także sformatować %s"
@@ -301,22 +397,22 @@ msgstr "Uruchamianie sieci"
 msgid "Bringing down the network"
 msgstr "Zatrzymywanie sieci"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Proszę czekać. Pobieranie pliku"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "dodanie nośnika było niemożliwe"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiowanie wybranych pakietów do późniejszego wykorzystania"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiowanie w toku"
@@ -346,7 +442,24 @@ msgstr "fajny"
 msgid "maybe"
 msgstr "taki sobie"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Pobieram informacje o pakietach z meta-danych XML..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Brak pliku z informacjami o programach znajdujących się na nośniku \"%s\". "
+"Wynik dla pakietu %s jest częściowy"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Brak opisu"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -355,66 +468,76 @@ msgstr ""
 "Niektóre pakiety wymagane przez %s nie mogą zostać zainstalowane:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Wystąpił błąd:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Wystąpił poważny błąd: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Nie pytaj ponownie"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transakcji instalacyjnych zakończonych niepowodzeniem"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Instalowanie pakietów nie powiodło się:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Stacja robocza"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Stacja biurowa"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programy biurowe: procesory tekstu (OpenOffice.org Writer, Kword), arkusze "
-"kalkulacyjne (OpenOffice.org, Kspread), przeglÄ…darki pdf, itd."
+"Programy biurowe: procesory tekstu (LibreOffice Writer, Kword), arkusze "
+"kalkulacyjne (LibreOffice, Kspread), przeglÄ…darki pdf, itd."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Stacja rozrywkowa (gry)"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programy rozrywkowe: gry przygodowe, planszowe, strategie, itd."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Stacja multimedialna"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programy do odtwarzania/edycji dźwięku i obrazu"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Stacja internetowa"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -423,193 +546,193 @@ msgstr ""
 "Zestaw narzędzi do odczytu i przesyłania poczty i grup dyskusyjnych (mutt, "
 "tin...) oraz przeglÄ…dania sieci"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Komputer sieciowy (klient)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Programy klienckie dla różnych protokołów włączając ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Narzędzia do łatwego zarządzania komputerem"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Narzędzia konsolowe"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Edytory, powłoki, narzędzia plikowe, terminale"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Programowanie"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Biblioteki programistyczne C i C++, programy i pliki nagłówkowe"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentacja"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Książki i dokumenty HOWTO o Linuksie i Otwartym Oprogramowaniu"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Obsługa aplikacji firm trzecich"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Serwer WWW"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "System do pracy grupowej"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Serwer Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Zapora sieciowa/router"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Bramka internetowa"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Poczta/wiadomości"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Serwer pocztowy Postfix, serwer grup Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Serwer katalogowy"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Serwer FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Serwer nazw domenowych i informacji sieciowych"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Serwer udostępniania plików i drukarek"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Serwer NFS, serwer Samby"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Baza danych"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Serwer bazodanowy PostgreSQL i MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Serwer bazodanowy PostgreSQL i MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Poczta"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Serwer pocztowy Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Serwer bazodanowy PostgreSQL i MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Serwer bazodanowy PostgreSQL i MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Serwer sieciowy"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Serwer NIS, serwer SMB, serwer pośrednika, serwer ssh"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Åšrodowisko graficzne"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Stacja KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -618,12 +741,12 @@ msgstr ""
 "Środowisko graficzne KDE, podstawowe środowisko graficzne ze zbiorem "
 "narzędzi towarzyszących"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Stacja GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -632,66 +755,127 @@ msgstr ""
 "Środowisko graficzne z przyjaznym dla użytkownika zbiorem aplikacji i "
 "narzędzi graficznych"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
 #, c-format
-msgid "LXDE Desktop"
-msgstr "Pulpit LXDE"
+msgid "XFCE Workstation"
+msgstr "Pulpit XFCE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:165
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Lekkie środowisko graficzne z przyjaznym dla użytkownika zbiorem aplikacji i "
+"narzędzi graficznych"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Pulpit MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Pulpit Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Åšrodowisko graficzne bazujÄ…ce na Gnome"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Pulpit LXQt"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Nowa generacja lekkiego środowiska graficznego przeportowanego na QT"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Pulpit Enlightenment E17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
 msgstr ""
 "Lekkie i szybkie środowisko graficzne z przyjaznym dla użytkownika zbiorem "
 "aplikacji i narzędzi graficznych"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:189
+#, c-format
+msgid "LXDE Desktop"
+msgstr "Pulpit LXDE"
+
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Lekkie i szybkie środowisko graficzne"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Pulpit Plasma"
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"Środowisko graficzne Plasma Desktop, podstawowe środowisko graficzne ze "
+"zbiorem narzędzi towarzyszących"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Inne środowiska graficzne"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, itd."
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, itd."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Narzędzia"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Serwer SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Serwer konfiguracji zdalnej Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Narzędzia sieciowe/monitorowanie"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Narzędzia do monitorowania, księgowania procesów, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Druidy Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Druidy do konfiguracji serwera"
@@ -705,7 +889,7 @@ msgstr ""
 "Wystąpił jakiś błąd i nie wiadomo, jak poprawnie go obsłużyć.\n"
 "Kontynuuj na własną odpowiedzialność."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -725,223 +909,228 @@ msgstr "PrzechodzÄ™ do kroku `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Instalacja Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Instalacja %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> pomiędzy elementami"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Serwer Xorg rozpoczyna działanie. Proszę czekać..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"System ma mało zasobów. Mogą wystąpić problemy z instalacją.\n"
-"Jeśli tak się dzieje, spróbuj instalacji w trybie tekstowym.\n"
-"Aby tak zrobić, naciśnij F1 podczas startu z CD i wpisz \"text\"."
+"System ma mało zasobów. Mogą wystąpić problemy z instalacją\n"
+"%s. Jeśli tak się dzieje, spróbuj instalacji w trybie tekstowym.\n"
+"Aby tak zrobić, naciśnij F1 podczas startu z CD i wpisz 'text'."
+
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr "Wybór nośników"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Zainstaluj środowisko graficzne Mageia KDE"
+msgid "Install %s KDE Desktop"
+msgstr "Zainstaluj środowisko graficzne %s KDE"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Zainstaluj środowisko graficzne Mageia GNOME"
+msgid "Install %s GNOME Desktop"
+msgstr "Zainstaluj środowisko graficzne %s GNOME"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Instalacja dowolna"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Pulpit KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Pulpit GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Dowolny pulpit"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "PrzeglÄ…d pulpitu '%s'."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Kliknij obrazek, aby zobaczyć większy podgląd"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Wybór grup pakietów"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Samodzielny wybór pakietów"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Rozmiar: %d / %d MB"
+msgid "Unselect All"
+msgstr "Odznacz wszystko"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Uszkodzony pakiet"
+msgid "Total size: %d / %d MB"
+msgstr "Rozmiar: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Wersja: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Rozmiar: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Ważność: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Nie można zmienić statusu tego pakietu"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "z powodu brakujÄ…cego %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "na skutek niespełnienia %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "próba aktualizacji wersji %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "w celu utrzymania %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Nie możesz wybrać tego pakietu. Nie ma już miejsca, by go zainstalować"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Zostaną zainstalowane następujące pakiety"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Zostaną usunięte następujące pakiety"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ten pakiet jest wymagany, nie można go pominąć"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Nie można odznaczyć tego pakietu. Został już zainstalowany"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Nie można odznaczyć tego pakietu. Musi zostać zaktualizowany"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Pokaż automatycznie wybrane pakiety"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Zainstaluj"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Wczytanie/Zapis zaznaczenia"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Uaktualnianie listy wybranych pakietów"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimalna instalacja"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "ZarzÄ…dzanie oprogramowaniem"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Wybierz pakiety do zainstalowania"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalowanie"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Bez szczegółów"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Pozostały czas:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(szacowanie...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
@@ -949,27 +1138,22 @@ msgstr[0] "pakiet"
 msgstr[1] "%d pakietów"
 msgstr[2] "%d pakietów"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Różne"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "nie skonfigurowano"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Wybór nośników"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -978,12 +1162,12 @@ msgstr ""
 "Znaleziono poniższe nośniki instalacyjne.\n"
 "Jeśli chcesz pominąć któreś z nich, możesz je teraz odznaczyć."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Istnieje możliwość skopiowania przed instalacją zawartości płyt CD na dysk "
@@ -991,72 +1175,72 @@ msgstr ""
 "Instalacja będzie kontynuowana z dysku twardego a skopiowane pakiety będą "
 "dostępne po zakończeniu instalacji."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Skopiuj wszystkie płyty CD"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Wystąpił błąd"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Wybierz układ klawiatury"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Oto pełna lista dostępnych klawiatur:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalacja/Uaktualnienie"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Czy to instalacja czy uaktualnienie?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Zainstaluj"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Uaktualnienie %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Klucz szyfrujÄ…cy dla %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Anuluj instalacjÄ™, uruchom komputer ponownie"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Nowa instalacja"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Zaktualizuj istniejÄ…cÄ… instalacjÄ™ (nie zalecane)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1064,7 +1248,7 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Instalator wykrył, że obecna instalacja systemu Mageia Linux nie może\n"
+"Instalator wykrył, że obecna instalacja systemu Mageia nie może\n"
 "zostać bezpiecznie zaktualizowana do wersji %s.\n"
 "\n"
 "Zalecana jest nowa instalacja, która zastąpi poprzednią.\n"
@@ -1072,38 +1256,17 @@ msgstr ""
 "Uwaga: wykonaj kopie wszystkich osobistych plików zanim wybierzesz\n"
 "opcjÄ™ \"Nowa instalacja\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Konfiguracja IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Brak wolnej przestrzeni na 1MB bootstrap! Instalacja będzie kontynuowana,"
-"lecz aby uruchomić system, należy utworzyć partycję bootstrap za pomocą "
-"programu DiskDrake."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Konieczne jest utworzenie bootstrap PPC PReP!. Instalacja będzie "
-"kontynuowana, lecz aby uruchomić system, należy utworzyć partycję bootstrap "
-"w programie DiskDrake."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1116,12 +1279,12 @@ msgstr ""
 "Włóż płytę \"%s\" do napędu i naciśnij Ok. Jeśli jej nie posiadasz, naciśnij "
 "Anuluj, aby pominąć instalację pakietów z tej płyty."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Wyszukiwanie dostępnych pakietów..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1130,7 +1293,7 @@ msgstr ""
 "Za mało miejsca na dysku dla przeprowadzenia instalacji lub aktualizacji  "
 "(%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1140,52 +1303,52 @@ msgstr ""
 "Format jest identyczny z dyskiem automatycznej\n"
 "instalacji."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Wczytaj"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Zapisz"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Nieprawidłowy plik"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Wybór pulpitu"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Możesz wybrać profil swojego pulpitu: "
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Wybrany rozmiar przekracza dostępne miejsce"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Typ instalacji"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1194,87 +1357,111 @@ msgstr ""
 "Nie wybrano żadnej grupy pakietów.\n"
 "Wybierz minimalną żądaną instalację:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Z X Window"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Zainstaluj sugerowane pakiety"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Z podstawowÄ… dokumentacjÄ… (zalecane!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Naprawdę minimalna instalacja (w szczególności bez urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Przygotowywanie aktualizacji..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Przygotowywanie instalacji"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalowanie pakietu %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Wystąpił błąd porządkowania pakietów:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Kontynuować?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Ponów próbę"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Pomiń ten pakiet"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Pomiń wszystkie pakiety z nośnika \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Wróć do wyboru nośników i pakietów"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Wystąpił błąd podczas instalowania pakietu %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Konfiguracja poinstalacyjna"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Upewnij się, że nośnik Update Modules znajduje się w napędzie %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Aktualizacje"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1294,28 +1481,29 @@ msgstr ""
 "\n"
 "Czy chcesz zainstalować uaktualnienia ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Sprzęt"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Karta dźwiękowa"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Czy posiadasz kartę dźwiękową ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1324,82 +1512,70 @@ msgstr ""
 "Uruchom \"alsaconf\" lub \"sndconfig\" po zakończeniu instalacji aby "
 "skonfigurować kartę dźwiękową"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Karta dźwiękowa nie została wykryta. Wypróbuj \"harddrake\" po zakończeniu "
 "instalacji"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfejs graficzny"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Sieć i Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Serwery pośredniczące"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "skonfigurowano"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Poziom bezpieczeństwa"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Zapora sieciowa"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktywowano"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "wyłączono"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Nie masz skonfigurowanego systemu X Window. Czy na pewno chcesz tego?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
+msgid "Preparing initial startup program..."
 msgstr "Przygotowywanie programu rozruchowego..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Proszę o cierpliwość, to może potrwać chwilę..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Prawdopodobnie posiadasz przestarzały (OldWorld)lub też nieznany (Unknown) "
-"komputer. Program rozruchowy yaboot nie będzie działał. Instalacja będzie "
-"kontynuowana, lecz konieczne jest użycie programu BootX, aby uruchomić "
-"komputer. Argument jądra dla głównego systemu plików \"/\": root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1408,17 +1584,17 @@ msgstr ""
 "W tym poziomie zabezpieczeń, dostęp do plików na partycji Windows jest "
 "ograniczony do administratora."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Włóż pustą dyskietkę do stacji %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Tworzenie dyskietki automatycznej instalacji..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1429,12 +1605,12 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz teraz zakończyć?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulacje"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Uruchom ponownie"
@@ -1529,13 +1705,6 @@ msgid ""
 "Users"
 msgstr "Użytkownicy"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Sieć"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1577,36 +1746,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Wyjdź"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programy biurowe: procesory tekstu (kword, abiword), arkusze kalkulacyjne "
-#~ "(kspread, gnumeric), przeglÄ…darki pdf, itd."
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Zdecydowałeś się na aktualizację systemu do wersji %s. W Twoim obecnym "
-#~ "systemie \n"
-#~ "wykryto zainstalowane KDE 3.5. Jeżeli zdecydujesz się na aktualizację "
-#~ "instalator nie zaktualizuje KDE 3.5.\n"
-#~ "KDE 3.5 zostanie zastÄ…pione przez KDE 4. W efekcie utracisz osobiste "
-#~ "ustawienia KDE.\n"
-#~ "Aby zaktualizować system i zachować KDE 3.5 z Twoimi osobistymi "
-#~ "ustawieniami,\n"
-#~ "uruchom ponownie komputer i zaktualizuj system używając apletu Mandriva "
-#~ "Update."
-
-#~ msgid "Proceed"
-#~ msgstr "Rozpocznij"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "pobieranie [%s] nie powiodło się"
diff --git a/perl-install/install/share/po/pt.po b/perl-install/install/share/po/pt.po
index 96c91a4d9..bd5b1e63e 100644
--- a/perl-install/install/share/po/pt.po
+++ b/perl-install/install/share/po/pt.po
@@ -1,71 +1,90 @@
-# translation of pt.po to Português
-# translation of pt.po to
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Latest versions of po files are at http://www.mandrivalinux.com/l10n/pt.php3
-#
-# Copyright (C) 2000 Mandriva
-#
-# Fernando Moreira <fmoreira@netc.pt>, 1999.
-# Jorge Costa <Jorgercosta@netc.pt>, 2001.
-# José JORGE <jose.jorge@oreka.com>, 2002,2003.
-# Jose Jorge <jjorge@free.fr>, 2003, 2004, 2005.
-# Jose Carlos D. S. Saraiva <jose.d.s.saraiva@clix.pt>, 2004.
-# Zé <mmodem00@netvisao.pt>, 2004, 2005, 2006.
-# Américo José Melo <mmodem00@netvisao.pt>, 2004, 2005.
-# Ze <mmodem00@netvisao.pt>, 2004.
-# José Melo <mmodem00@gmail.com>, 2005.
-# José Melo <mmodme00@gmail.com>, 2005.
-# Jose JORGE <jjorge@free.fr>, 2005.
-# Zé <mmodem00@gmail.com>, 2006, 2007, 2008, 2010.
-# Zé <ze@mandriva.org>, 2008.
-# Zé <mmodem00@gmal.com>, 2010.
+# Translators:
+# alfalb_mansil, 2014
+# Fernando Moreira <fmoreira@netc.pt>, 1999
+# Jorge Costa <Jorgercosta@netc.pt>, 2001
+# Jose Carlos D. S. Saraiva <jose.d.s.saraiva@clix.pt>, 2004
+# zecas <jjorge@free.fr>, 2003-2005
+# José JORGE <jose.jorge@oreka.com>, 2002-2003
+# alfalb_mansil, 2013-2015
+# MMSRS, 2015
+# Pedro <simplew8@gmail.com>, 2012
+# Zé <ze@mandriva.org>, 2004-2006,2008,2010-2012
 msgid ""
 msgstr ""
-"Project-Id-Version: pt\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2010-05-01 21:56+0100\n"
-"Last-Translator: Zé <mmodem00@gmal.com>\n"
-"Language-Team: Portuguese <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-06-18 13:43+0000\n"
+"Last-Translator: MMSRS\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/mageia/"
+"language/pt/)\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr "Junte-se a Nós!"
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr "A sua escolha!"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "O seu ecrã num dispositivo USB"
+msgid "Office tools"
+msgstr "Ferramentas de Escritório"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "A distribuição Mageia Linux 100%% código livre"
+msgid "Home entertainment"
+msgstr "Entretenimento em Casa"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Explore o Linux facilmente com o Mageia One"
+msgid "For kids"
+msgstr "Para os miúdos!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Um ecrã Mageia Linux completo, com suporte"
+msgid "For family!"
+msgstr "Para a família!"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: distribuições para as necessidades de todos os utilizadores"
+msgid "For developers!"
+msgstr "Para os responsáveis pelo desenvolvimento!"
 
-#: any.pm:109
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Obrigado!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Seja Livre!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Tem mais alguma média suplementar?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -78,93 +97,90 @@ msgstr ""
 "\n"
 "Tem alguma média de instalação suplementar para configurar?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Rede (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Rede (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Rede (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL do espelho?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "O URL deve começar por ftp:// ou http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"A contactar o sítio web Mageia Linux para obter a lista de espelhos "
-"disponíveis..."
+"A contactar o sítio 'web' %s para obter a lista de espelhos disponíveis..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Falha ao contactar o sítio web Mageia Linux para obter a lista de espelhos "
+"Falha ao contactar o sítio 'web' %s para obter a lista de espelhos "
 "disponíveis"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Escolha um espelho para transferir os pacotes"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Configuração NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
-msgstr "Por favor indique o endereço e o directório da sua média NFS"
+msgstr "Por favor indique o nome da máquina e o directório da sua média NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
-msgstr "Nome do endereço em falta"
+msgstr "Nome da máquina em falta"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "O directório deve começar por \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
-msgstr "Endereço da montagem NFS?"
+msgstr "Nome da máquina da montagem NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Directório"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Suplementar"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -173,23 +189,90 @@ msgstr ""
 "Não é possível encontrar o ficheiro hdlist neste espelho. Certifique-se que "
 "a localização está correcta."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Lançamento do Núcleo"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Lançamento Não Gratuito"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Deverá ativar \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" contém as várias partes dos sistemas e das suas aplicações"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" não contém programas gratuitos.\n"
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Este disco fornece o pacote de atualizações para \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "A verificar os pacotes já instalados..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "A procurar pacotes para actualizar..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "A remover pacotes antes de actualizar..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -203,87 +286,87 @@ msgstr ""
 "\n"
 "Deseja realmente remover estes pacotes ?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erro ao ler o ficheiro %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Os seguintes discos foram renomeados:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (anteriormente conhecido por %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rede"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Por favor escolha uma média"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "O ficheiro já existe. Deseja sobrepôr o ficheiro?"
+msgstr "O ficheiro já existe. Deseja substituir o ficheiro?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nome NFS inválido"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
-msgstr "Média danificada %s"
+msgstr "Média inválida %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Não é possível capturar imagens do ecrã antes de particionar"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "As capturas de ecrã estarão disponíveis após instalar em %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalação"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configuração"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Deve também formatar %s"
@@ -307,22 +390,22 @@ msgstr "A ligar a rede"
 msgid "Bringing down the network"
 msgstr "A desligar a rede"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Por favor aguarde, a obter o ficheiro"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "não é possível adicionar média"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "A copiar alguns pacotes no disco para uso futuro"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Cópia em progresso"
@@ -352,7 +435,23 @@ msgstr "bom"
 msgid "maybe"
 msgstr "talvez"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Nenhuma informação xml da média \"%s\", apenas resultado parcial do pacote %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Nenhuma descrição"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -361,262 +460,272 @@ msgstr ""
 "Alguns pacotes pedidos por %s não podem ser instalados:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Ocorreu um erro:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Ocorreu um erro fatal: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Não perguntar novamente"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transacções de instalação falhadas"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Instalação dos pacotes falhada:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Estação de Trabalho"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Estação de Trabalho de Escritório"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programas Office: processadores de texto (OpenOffice.org Writer, Kword), "
-"folhas de cálculo (OpenOffice.org Calc, Kspread), visualizadores PDF, etc"
+"Programas Office: processadores de texto (LibreOffice Writer, Kword), folhas "
+"de cálculo (LibreOffice Calc, Kspread), visualizadores PDF, etc"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Estação de Jogo"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programas de divertimento: arcada, tabuleiros, estratégia, etc"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Estação multimédia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Aplicações de reprodução/edição de som e vídeo"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Estação internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
-"Conjunto de ferramentas para ler e enviar correio electrónico e news (pine, "
-"mutt, tin...) e para navegar na Web"
+"Conjunto de ferramentas para ler e enviar correio electrónico e noticias "
+"(pine, mutt, tin...) e para navegar na 'Web'"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Computador de Rede (cliente)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clientes para diferentes protocolos incluindo ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ferramentas para facilitar a configuração do seu computador"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Ferramentas de Consola"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr ""
 "Editores, Linha de Comandos (shell), ferramentas de ficheiros, terminais"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Desenvolvimento"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C e C++ bibliotecas de programação, programas e ficheiros 'include'"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentação"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Livros e Howto's sobre o Linux e Programas Livres"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Base Padrão do Linux (LSB). Suporte a aplicações terceiras."
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Servidor Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Servidor Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet gateway"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Correio/Noticias"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Servidor de correio electrónico Postfix , servidor de noticias In"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Servidor de Directório"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Nome do Domínio e Servidor de Informação da Rede"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Servidor de Partilhas de Ficheiros e Impressão"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Servidor NFS, Servidor Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Base de Dados"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Servidor de Base de Dados PostgreSQL e MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Correio Electrónico"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Servidor de correio electrónico Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de Base de Dados PostgreSQL ou MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Servidor/Computador de Rede"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambiente Gráfico"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Estação de Trabalho KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -625,12 +734,12 @@ msgstr ""
 "O Ecrã de Trabalho K (KDE), o ambiente gráfico básico com uma colecção de "
 "ferramentas de acompanhamento"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Estação de Trabalho GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -639,67 +748,122 @@ msgstr ""
 "Um ambiente gráfico com um conjunto de aplicações amigáveis e ferramentas de "
 "ecrâ"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Estação de Trabalho KDE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Estação de Trabalho MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Estação de Trabalho Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "O ambiente gráfico baseado no GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Ambiente de Trabalho LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "�rea de Trabalho e17 Enlightenment"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Ecrâ LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Ambiente de Trabalho Plasma"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Um ambiente gráfico leve e rápido com um conjunto de aplicações amigáveis e "
-"ferramentas de ecrâ"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Outros Ambientes Gráficos"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, etc."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilidades"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Servidor SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Servidor de Configuração Remota Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Utilidades de Rede/Monitorização"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 "Monitorização de ferramentas, contabilidade de processos, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Assistentes Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Assistentes para configurar o servidor"
@@ -713,7 +877,7 @@ msgstr ""
 "Ocorreu um erro, mas é possível saber como resolver correctamente.\n"
 "Continue a seu próprio risco."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -733,251 +897,251 @@ msgstr "A entrar na etapa `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Instalação Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Instalação %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> entre elementos"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "O servidor Xorg está lento para iniciar. Por favor aguarde..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "O seu sistema é baixo em recursos. Pode ter algum problema ao instalar\n"
-"o Mageia Linux. Se isso ocorrer, pode tentar uma instalação em modo texto.\n"
+"o %s. Se isso ocorrer, pode tentar uma instalação em modo texto.\n"
 "Para isso, prima `F1' quando arrancar do CDROM, e depois digite `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Instalar Ecrã KDE Mageia"
+msgid "Media Selection"
+msgstr "Selecção de Média"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Instalar Ecrã GNOME Mageia"
+msgid "Install %s KDE Desktop"
+msgstr "Instalar Ecrã KDE %s"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Instalar Ecrã GNOME %s"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Instalação personalizada"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Ecrâ KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Ecrâ GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Ecrâ Personalizado"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Aqui está uma previsão do ecrã  '%s'."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Clique nas imagens para ver uma previsão maior."
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Selecção dos Grupos de Pacotes"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Selecção individual de pacotes"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Tamanho total: %d / %d MB"
+msgid "Unselect All"
+msgstr "Desmarcar Tudo"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Pacote danificado"
+msgid "Total size: %d / %d MB"
+msgstr "Tamanho total: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versão: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Tamanho: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Importância: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Não pode seleccionar/desseleccionar este pacote"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "devido a faltar %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "devido a %s insatisfeitas"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "a tentar promover %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "para manter %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Não pode seleccionar este pacote pois não existe espaço livre para o instalar"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Os seguintes pacotes irão ser instalados"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Os seguintes pacotes irão ser removidos"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Este é um pacote obrigatório, não pode ser desmarcado"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Não pode desmarcar este pacote. Já se encontra instalado"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Não pode desmarcar este pacote. Tem que ser actualizado"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Mostrar pacotes seleccionados automaticamente"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalar"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Carregar/Gravar selecção"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "A actualizar selecção de pacotes"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Instalação mínima"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Gestão de Programas"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Escolha os pacotes que deseja instalar"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalação"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Sem detalhes"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Tempo restante:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(a estimar...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pacote"
 msgstr[1] "%d pacotes"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Sumário"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configurar"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "não configurado"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Selecção de Média"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -986,85 +1150,85 @@ msgstr ""
 "A seguinte média de instalação foi encontrada.\n"
 "Se quer evitar alguns deles, pode desmarcá-los agora."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Tem a opção de copiar o conteúdo dos CDs para o disco rígido antes da "
 "instalação.\n"
-"Irá continuar a partir do disco rígido e os pacotes irão permanecer "
-"disponíveis assim que o sistema estiver instalado."
+"Continuará a partir do disco rígido e os pacotes permanecerão disponíveis "
+"assim que o sistema estiver instalado."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copiar todos os CDs"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Ocorreu um erro"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Por favor escolha o tipo de teclado"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Aqui está a lista completa dos teclados disponíveis:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalar/Actualizar"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Isto é uma instalação ou uma actualização?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalar"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Actualizar %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Senha de encriptação para %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Cancelar instalação, reiniciar o sistema"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Nova Instalação"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Actualizar instalação anterior (não recomendado)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1072,46 +1236,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"O instalador detectou que o seu sistema Mageia Linux não pode\n"
-"ser seguramente actualizado para o %s.\n"
+"O instalador detectou que o seu sistema Linux instalados não pode\n"
+"ser seguramente actualizado para %s.\n"
 "\n"
 "Recomenda-se que substitua a sua instalação anterior.\n"
 "\n"
 "Aviso: deve salvaguardar todos os seus dados pessoais antes de\n"
 "escolher \"Nova Instalação\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "A configurar IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Sem espaço livre para a partição de arranque de 1MB (bootstrap)! A "
-"instalação irá continuar, mas para arrancar o seu sistema, irá precisar de "
-"criar a partição de arranque no DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Irá precisar de criar uma partição de arranque (PPC PReP Boot bootstrap)! A "
-"instalação irá continuar, mas para arrancar o seu sistema, irá precisar de "
-"criar a partição de arranque no DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1123,12 +1266,12 @@ msgstr ""
 "Por favor insira o Cd-Rom  \"%s\" no seu dispositivo e prima Ok.\n"
 "Se não tiver este  Cd-Rom, prima Cancelar para evitar a instalação deste."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "A procurar pacotes disponíveis..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1137,7 +1280,7 @@ msgstr ""
 "O seu sistema não tem espaço suficiente em disco para instalar ou actualizar "
 "(%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1146,52 +1289,52 @@ msgstr ""
 "Por favor escolha carregar ou gravar uma selecção de pacotes.\n"
 "O formato é o mesmo como o dos ficheiros gerados por auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Carregar"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Gravar"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Ficheiro danificado"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Selecção de Ecrã"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Pode escolher o seu perfil de ambiente de trabalho."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "O tamanho seleccionado é maior que o espaço disponível"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipo de instalação"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1200,89 +1343,113 @@ msgstr ""
 "Não escolheu qualquer grupo de pacotes.\n"
 "Por favor escolha o tipo de instalação mínima que deseja:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Com X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Instalar pacotes sugeridos"
+msgid "Install recommended packages"
+msgstr "Instale os pacotes recomendados "
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Com documentação básica (recomendado!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instalação mínima (especialmente sem urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "A preparar a atualização ..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "A preparar instalação"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "A instalar o pacote %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Ocorreu um erro ao ordenar os pacotes:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Continuar mesmo assim?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Tentar novamente"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Saltar este pacote"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Saltar todos os pacotes da média \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Voltar à média e selecção de pacotes"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Ocorreu um erro ao instalar o pacote %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuração pós-instalação"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Por favor certifique-se que a média Módulos de Actualização está no "
 "dispositivo %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Actualizações"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Isto permite instalar as atualizações de segurança."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1298,32 +1465,33 @@ msgstr ""
 "Estes pacotes foram actualizados após o lançamento da distribuição.\n"
 "Podem ter correcções de segurança ou de erros.\n"
 "\n"
-"Para transferir estes pacotes, irá precisar de uma conexão Internet activa.\n"
+"Para transferir estes pacotes, precisará de uma conexão Internet activa.\n"
 "\n"
 "Deseja instalar as actualizações ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s em %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Material"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Placa de Som"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Tem alguma placa de som ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1332,80 +1500,68 @@ msgstr ""
 "Execute \"alsaconf\" ou \"sndconfig\" após a instalação para configurar a "
 "sua placa de som"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Nenhuma placa de som detectada. Tente \"harddrake\" após a instalação"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interface gráfico"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Rede e Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxies"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "configurado"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Nível de Segurança"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "activado"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "desactivado"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Não configurou o X. Tem certeza que deseja fazer isto?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "A preparar o carregador de arranque..."
+msgid "Preparing initial startup program..."
+msgstr "A preparar o programa inicial de arranque..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Seja paciente, isto pode demorar algum tempo..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Parece ter uma máquina do Século Passado ou Desconhecida, o carregador de "
-"arranque yaboot não irá funcionar para si. A instalação irá continuar, mas "
-"irá precisar de usar o BootX ou algum outro meio para arrancar a sua "
-"máquina. O argumento do kernel para root fs é: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1414,17 +1570,17 @@ msgstr ""
 "Neste nível de segurança, o acesso aos ficheiros na partição do Windows é "
 "limitado ao administrador."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Insira uma disquete vazia no dispositivo %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "A criar disquete de auto-instalação..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1435,12 +1591,12 @@ msgstr ""
 "\n"
 "Deseja realmente sair agora?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Parabéns"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Reiniciar"
@@ -1535,13 +1691,6 @@ msgid ""
 "Users"
 msgstr "Utilizadores"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Rede"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1583,67 +1732,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Sair"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programas office: processadores de texto (kword, abiword), folhas de "
-#~ "cálculo (kspread, gnumeric), visualizadores pdf, etc"
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Decidiu actualizar o seu sistema para %s. Foi detectado o KDE 3.5 no seu\n"
-#~ "sistema. Este instalador não pode perservar o KDE 3.5 numa actualização. "
-#~ "Se decidir continuar,\n"
-#~ "O KDE 4 irá substituir o KDE 3, e irá perder as suas configurações "
-#~ "pessoais.\n"
-#~ "Para actualizar com o KDE 3.5 e as suas configurações pessoais "
-#~ "perservadas,\n"
-#~ "por favor reinicie o seu sistema e actualize usando a ferramenta de "
-#~ "actualização Mandriva."
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "A transferir o ficheiro %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr ""
-#~ "A actualização de uma distribuição 32bit para uma 64bit não é suportada"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr ""
-#~ "A actualização de uma distribuição 64bit para uma 32bit não é suportada"
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Seleccionou o(s) seguinte(s) servidor(es): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Estes servidores são activados por omissão. Não têm qualquer problema\n"
-#~ "de segurança conhecido, mas podem ser encontrados alguns novos "
-#~ "problemas.\n"
-#~ "Nesse caso, deve actualizar o seu sistema assim que possível.\n"
-#~ "\n"
-#~ "\n"
-#~ "Deseja realmente instalar estes servidores?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "Ecrã IceWm"
diff --git a/perl-install/install/share/po/pt_BR.po b/perl-install/install/share/po/pt_BR.po
index 83784c35d..31aa44142 100644
--- a/perl-install/install/share/po/pt_BR.po
+++ b/perl-install/install/share/po/pt_BR.po
@@ -1,68 +1,92 @@
-# translation of pt_BR.po to Brazilian portuguese
-# translation of pt_BR.po to
-# tradução de DrakX-pt_BR.po para Português do Brasil
-# DRAKX PT_BR PO FILE
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-# Lisiane Sztoltz Teixeira <lisiane@mandriva.com>
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Andrei Bosco Bezerra Torres <andrei_bosco@yahoo.com.br>, 2000, 2003.
-# Bruno Dorfman Buys <brunobuys@zipmail.com.br>, 2002.
-# Tiago da Cruz Bezerra <tiagocruz18@uol.com.br>,2002 2003, 2004.
-# Ricardo de Castilho <cast_brasil@ig.com.br>, 2003.
-# Carlinhos Cecconi <carlinux@terra.com.br>, 2003, 2004.
-# Deivi Lopes Kuhn <deivikuhn@yahoo.com.br>, 2003, 2004.
-# Cristiano Otto Von Trompczynski <cris@mandriva.com>, 2005.
-# Arthur R. Mello <renato@conectiva.com.br>, 2005.
-# Arthur Renato Mello <renato@conectiva.com.br>, 2005.
-# Felipe Arruda <felipemiguel@gmail.com>, 2006, 2007, 2008.
-# Sergio Rafael Lemke <sergio@mandriva.com.br>, 2009, 2010.
+# Translators:
+# Andrei Bosco Bezerra Torres <andrei_bosco@yahoo.com.br>, 2000,2003
+# Arthur Renato Mello <renato@conectiva.com.br>, 2005
+# Arthur R. Mello <renato@conectiva.com.br>, 2005
+# Bruno Dorfman Buys <brunobuys@zipmail.com.br>, 2002
+# Carlinhos Cecconi <carlinux@terra.com.br>, 2003-2004
+# Cristiano Otto Von Trompczynski <cris@mandriva.com>, 2005
+# Deivi Lopes Kuhn <deivikuhn@yahoo.com.br>, 2003-2004
+# Felipe Arruda <felipemiguel@gmail.com>, 2006-2008
+# Marcio Andre Padula <padula1000@gmail.com>, 2014-2015
+# Ricardo de Castilho <cast_brasil@ig.com.br>, 2003
+# Sergio Rafael Lemke <sergio@mandriva.com.br>, 2009-2010
+# Tiago da Cruz Bezerra <tiagocruz18@uol.com.br>,2002 2003, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: pt_BR\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2010-05-11 17:34-0300\n"
-"Last-Translator: Sergio Rafael Lemke <sergio@mandriva.com.br>\n"
-"Language-Team: Brazilian Portuguese <cooker-i18n@mandrivalinux.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 23:32+0000\n"
+"Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
+"mageia/language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Seu desktop em um pendrive USB"
+msgid "Join Us!"
+msgstr "Cadastre-se!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "A distribuição Mageia Linux 100%% open source"
+msgid "Make it yours!"
+msgstr "Faça-lhe seu!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Explore facilmente o Linux com o Mageia One"
+msgid "Your choice!"
+msgstr "Sua escolha!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Um Desktop Mageia Linux completo, com suporte"
+msgid "Office tools"
+msgstr "ferramentas do Office"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: distribuições para todas as necessidades"
+msgid "Home entertainment"
+msgstr "entretenimento de casa"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Para Crianças"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Para Familia!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Para os desenvolvedores!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Obrigado!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Seja livre!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Você tem alguma mídia suplementar ?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -76,93 +100,88 @@ msgstr ""
 "\n"
 "Deseja configurar alguma mídia adicional ?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Rede (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Rede (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Rede (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL do Servidor?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "A URL deve começar com ftp:// ou http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Acessando o site do Mageia Linux para pegar a lista de servidores "
-"disponíveis..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Acessando o site do %s para pegar a lista de servidores disponíveis..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Falha acessando o site do Mageia Linux em busca da lista de servidores "
-"disponíveis"
+"Falha acessando o site do %s em busca da lista de servidores disponíveis"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Escolha um servidor de onde pegar os pacotes "
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Configuração NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Entre o hostname e o diretório da sua mídia NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Hostname faltando"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "O diretório deve começar com \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Hostname do ponto de montagem NFS"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Diretório"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Suplementar"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -171,23 +190,97 @@ msgstr ""
 "Não encontro uma lista de pacotes neste servidor. Verifique se a localização "
 "está correta."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Núcleo de Lançamento"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Lançamento Tainted"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Lançamento nonfree"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Alguns hardware em sua máquina precisa de alguns firmwares non-free para que "
+"os drivers de software livre para trabalhar."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Você deve habilitar o \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" contém várias partes do sistema e suas aplicações"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" contém software non-free. \n"
+
+#: any.pm:477
+#, 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 ""
+"Também contém firmwares necessários para determinados dispositivos para "
+"operar (por exemplo: algumas placas gráficas ATI/AMD, algumas placas de "
+"rede, algumas placas RAID, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" Contém um software que não pode ser distribuído em todos os países "
+"devido a patentes de software."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "Também contém software \"%s\" reconstruir com recursos adicionais."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Aqui você pode ativar mais mídia, se quiser."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Este meio fornece atualizações de pacotes para o meio \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Verificando pacotes já instalados..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Encontrando pacotes para atualizar..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Removendo pacotes antes de atualizar..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -200,87 +293,87 @@ msgstr ""
 "\n"
 "Realmente deseja remover estes pacotes?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erro ao ler arquivo %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "O seguinte disco(s) foi renomeado:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (previamente chamado %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rede"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Escolha uma mídia"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "O arquivo já existe. Sobrescrevê-lo?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nome NFS inválido"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Mídia %s ruim"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Não foi possível capturar telas antes de particionar"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "As captura de tela ficarão disponíveis depois da instalação em %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalação"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configuração"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Você também deve formatar %s"
@@ -304,22 +397,22 @@ msgstr "Ativando a rede"
 msgid "Bringing down the network"
 msgstr "Desativando a rede"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Aguarde, obtendo o arquivo"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "incapaz de adicionar mídia"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Copiando alguns pacotes em disco para uso posterior"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Cópia em progresso"
@@ -349,7 +442,23 @@ msgstr "bom"
 msgid "maybe"
 msgstr "talvez"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Obtendo informações sobre o pacote de meta-dados XML ..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Sem xml info para a mídia \"%s\", somente resultado parcial para o pacote %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Sem descrição"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -358,66 +467,76 @@ msgstr ""
 "Alguns pacotes requeridos por %s não podem ser instalados:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Um erro ocorreu:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Ocorreu um erro fatal: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Não pergunte novamente"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d Instalação Falhou"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Instalação dos programas falhou:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Estação de Trabalho"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Ambiente de Escritório"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programas de escritório: processadores de texto (OpenOffice.org Writer, "
-"Kword), tabelas (OpenOffice.org Calc, Kspread), visualizadores PDF, etc."
+"Programas de escritório: processadores de texto (LibreOffice Writer, Kword), "
+"tabelas (LibreOffice Calc, Kspread), visualizadores PDF, etc."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Estação de Jogos"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programas de entretenimento: arcade, tabuleiro, estratégia, etc."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Estação Multimídia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programas de edição/reprodução de som e vídeo"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Estação de Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -426,194 +545,194 @@ msgstr ""
 "Conjunto de ferramentas para ler e enviar mensagens e notícias (mutt, "
 "tin...) e para navegar na Web."
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Computador de rede (cliente)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clientes para diferentes protocolos, incluindo ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Ferramentas para facilitar a configuração do seu computador"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Ferramentas de Console"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editores, shells, ferramentas de arquivos, terminais"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Desenvolvimento"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Bibliotecas de desenvolvimento C e C++, programas e arquivos include"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentação"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Livros, documentos e tutoriais sobre Linux e Software Livre"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Suporte a aplicativos de terceiros"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Servidor Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Servidor Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Firewall/Roteador"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Gateway Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "E-mail/Notícias"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Servidor de e-mail Postfix, servidor de notícias Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Servidor de Diretório"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr ""
 "Servidor de Nomes do Domínio (DNS) e Servidor de Informações de Rede (NIS)"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Servidor de Compartilhamento de Impressoras e Arquivos"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Servidor NFS, Servidor Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Banco de dados"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Servidor de banco de dados PostgreSQL e MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Servidor de banco de dados PostgreSQL e MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "E-mail"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Servidor de e-mail Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de banco de dados PostgreSQL ou MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Servidor de banco de dados PostgreSQL ou MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Servidor de Rede"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambiente Gráfico"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Ambiente KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -622,12 +741,12 @@ msgstr ""
 "O ambiente de trabalho KDE, sua área de trabalho básica acompanhada por uma "
 "coleção extra de ferramentas"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Ambiente GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -635,67 +754,126 @@ msgid ""
 msgstr ""
 "Um ambiente gráfico com um conjunto de aplicativos e ferramentas amigáveis"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Estação de trabalho XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Um ambiente gráfico mais leve com o conjunto de usuario amigável de "
+"aplicações e ferramentas de desktop"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Estação de Trabalho MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Estação de Trabalho Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Um ambiente gráfico baseado em GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Ambiente LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "A próxima geração QT, porta do ambiente lightweight"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "�rea de Trabalho Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Um ambiente gráfico rápido leve, com uma sequência específica"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Ambiente de Trabalho LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "O lightweight é um ambiente gráfico, rápido e leve"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasma �rea de Trabalho"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Um ambiente gráfico leve & rápido com uma coleção amigável de programas e "
-"ferramentas de desktop"
+"É um ambiente gráfico básico com uma coleção de ferramentas que acompanham a "
+"�rea de Trabalho Plasma"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Outros ambientes de �rea de trabalho"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilitários"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Servidor SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Servidor de Configuração Remota Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Utilitários de Rede/Monitoramento"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 "Ferramentas de monitoração, contabilização de processos, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Assistentes Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Assistentes para configurar o servidor"
@@ -709,7 +887,7 @@ msgstr ""
 "Um erro ocorreu, mas não é possível tratá-lo.\n"
 "Continue por sua própria conta e risco."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -729,253 +907,252 @@ msgstr "Entrando no passo `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Instalação do Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Instalação do %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> move entre elementos"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "O servidor Xorg leva algum tempo para iniciar. Favor esperar..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Seu sistema está com poucos recursos. Você pode ter algum problema na\n"
-"instalação do Mageia Linux. Se isso ocorrer, você pode tentar instalar "
-"usando o\n"
+"instalação do %s. Se isso ocorrer, você pode tentar instalar usando o\n"
 "modo texto. Para isso, aperte 'F1' na tela de inicialização e escreva 'text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Instalar Desktop Mageia KDE"
+msgid "Media Selection"
+msgstr "Seleção de Mídia"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Instalar Desktop Mageia GNOME"
+msgid "Install %s KDE Desktop"
+msgstr "Instalar Desktop %s KDE"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Instalar Desktop %s GNOME"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Instalação personalizada"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Desktop KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Desktop GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Desktop personalizado"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Aqui está uma prévia do ambiente '%s'."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Clique nas imagens para ampliá-las"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Seleção de Grupo de Pacotes"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Seleção individual de pacotes"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Tamanho total: %d / %d MB"
+msgid "Unselect All"
+msgstr "Desmarcar Tudo"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Pacote defeituoso"
+msgid "Total size: %d / %d MB"
+msgstr "Tamanho total: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versão: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Tamanho: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Importância: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Você não pode selecionar/desmarcar este pacote"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "devido a falta de %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "devido a %s não-satisfeito(a)"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "tentando promover %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "a fim de manter %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Você não pode selecionar esse pacote pois não existe espaço livre para "
 "instalá-lo"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Os seguintes pacotes serão instalados"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Os seguintes pacotes serão removidos"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Esse é um pacote obrigatório, e não pode ser desmarcado"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Você não pode desmarcar esse pacote. Ele já está instalado"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Você não pode desmarcar este pacote. Ele precisa ser atualizado"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Mostrar automaticamente os pacotes selecionados"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalar"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Carregar/Salvar seleção"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Atualizando seleção de pacotes"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Instalação mínima"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Gerenciamento de Software"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Escolha os pacotes que você quer instalar"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalando"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Sem detalhes"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Restam:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(estimando...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pacote"
 msgstr[1] "%d pacotes"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Resumo"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configurar"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "não configurado"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Seleção de Mídia"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -984,12 +1161,12 @@ msgstr ""
 "As seguintes mídias de instalação foram encontradas.\n"
 "Se você deseja ignorar alguma delas, você pode desmarcá-la agora."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Você pode copiar o conteúdo dos CDs para o seu disco rígido antes da "
@@ -997,72 +1174,72 @@ msgstr ""
 "A instalação irá continuar a partir do seu disco rígido e os pacotes "
 "continuarão disponíveis após a instalação ser finalizada."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copiar todos os CDs"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Ocorreu um erro"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Escolha o layout do seu teclado"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Aqui está a lista completa dos teclados disponíveis:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalar/Atualizar"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Esta é uma instalação ou atualização?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalar"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Atualizar %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Chave de criptografia para %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Cancelar instalação, reiniciar o sistema"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Nova Instalação"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Atualizar instalação anterior (não recomendado)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1070,47 +1247,26 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"O instalador detectou que o seu sistema Mageia Linux pode não ser\n"
-"atualizado com segurança para %s.\n"
+"O instalador detectou que o sistema Linux instalado não poderia \n"
+"seguramente ser atualizado para %s.\n"
 "\n"
-"É recomendada uma nova instalação substituindo a anterior.\n"
+"Recomenda-se nova instalação substituindo a anterior. \n"
 "\n"
-"Atenção: você deve salvar todos os seus dados pessoais antes de escolher "
-"\"Nova\n"
+"Aviso: você deve fazer backup de todos os seus dados pessoais antes de "
+"escolher \"Nova\n"
 "Instalação\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Configurando IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Sem espaço livre para bootstrap de 1MB! A instalação continuará, mas para "
-"poder iniciar seu sistema você precisará criar uma partição bootstrap no "
-"DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Você precisará criar um PPC PReP Boot bootstrap! O instalador irá continuar, "
-"mas para iniciar seu sistema, você precisa criar uma partição bootstrap no "
-"DiskDrake."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1125,12 +1281,12 @@ msgstr ""
 "Se você não o tiver em mãos, clique em Cancelar para evitar a instalação "
 "desse CD-ROM."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Procurando por pacotes disponíveis..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1139,7 +1295,7 @@ msgstr ""
 "Seu sistema não possui espaço suficiente para a instalação ou atualização "
 "(%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1148,52 +1304,52 @@ msgstr ""
 "Escolha entre carregar ou salvar a seleção de pacotes. \n"
 "O formato é o mesmo que os arquivos gerados pelo auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Carregar"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Salvar"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Arquivo corrompido"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Seleção de Ambiente"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Aqui você escolhe seu ambiente preferido."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "O tamanho escolhido é maior que o espaço disponível"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipo de instalação"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1202,87 +1358,113 @@ msgstr ""
 "Você não selecionou um grupo de pacotes.\n"
 "Escolha a instalação mínima que deseja:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Com X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Instalar pacotes sugeridos"
+msgid "Install recommended packages"
+msgstr "Instalar pacotes recomendados"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Com documentação básica (recomendado)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instalação mínima (sem o uprmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Preparando atualização..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Preparando a instalação"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalando o pacote %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Houve um erro durante a ordenação dos pacotes:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Continuar mesmo assim?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Tentar Novamente"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Pular este pacote"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Pular todos os pacotes da mídia \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Voltar para a seleção de mídia e de pacotes"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Houve um erro durante a instalação do pacote %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuração pós-instalação"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Certifique-se que a mídia Atualizar Módulos está no drive %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Atualizações"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Você tem agora a oportunidade de mídia on-line de configuração."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Isso permite instalar atualizações de segurança."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Para configurar essas mídia, você precisará estar conectado na internet.\n"
+"Você quer configurar o suporte de atualização?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1302,28 +1484,29 @@ msgstr ""
 "\n"
 "Você deseja instalar estas atualizações?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s em %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Placa de som"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Você tem alguma placa de som ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1332,81 +1515,69 @@ msgstr ""
 "Execute \"alsaconf\"ou \"sndconfig\" após a instalação para configurar sua "
 "placa de som"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Nenhuma placa de som detectada. Tente o \"harddrake\" após a instalação"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interface gráfica"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Rede & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxies"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "configurado"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Nível de Segurança"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "Ativado"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "Desativado"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Você não configurou o sistema X. Você quer realmente deixar assim?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Preparando gerenciador de inicialização"
+msgid "Preparing initial startup program..."
+msgstr "Preparando para iniciar programa..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Aguarde, pode demorar um pouco..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Você parece ter uma máquina muito antiga ou desconhecida, e o gerenciador de "
-"inicialização yaboot não funcionará para você. A instalação continuará, mas "
-"você precisará usar o BootX ou outros meios para inicializar sua máquina. O "
-"argumento do kernel para o sistema de arquivos raiz é: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1415,17 +1586,17 @@ msgstr ""
 "Neste nível de segurança, o acesso aos arquivos em partições Windows é "
 "restrita apenas para o administrador."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Insira um disquete vazio no drive %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Criando disquete de instalação automática..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1436,12 +1607,12 @@ msgstr ""
 "\n"
 "Você realmente quer sair agora?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Parabéns"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Reiniciar"
@@ -1536,13 +1707,6 @@ msgid ""
 "Users"
 msgstr "Usuários"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Rede"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1584,70 +1748,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Sair"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programas de escritório: processadores de texto (Kword, Abiword), tabelas "
-#~ "(Kspread, Gnumeric), visualizadores PDF, etc"
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Você decidiu atualizar o seu sistema para o %s. O KDE 3.5 foi detectado "
-#~ "no seu sistema.\n"
-#~ "Este instalador não pode preservar o KDE 3.5 durante a atualização. Se "
-#~ "você optar por proceder, \n"
-#~ "o KDE 4 substituirá o KDE 3, e você perderá as configurações pessoais do "
-#~ "KDE. \n"
-#~ "Para atualizar e manter o KDE 3.5 e suas configurações pessoais, por "
-#~ "favor reinicie o seu sistema\n"
-#~ "e faça a tualização utilizando o applet da Mandriva."
-
-#~ msgid "Proceed"
-#~ msgstr "Proceder"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "aquisição de [%s] falhou"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Baixando arquivo %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr "A atualização de distribuição 32 bits para 64 bits não é suportada"
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr "A atualização de distribuição 64 bits para 32 bits não é suportada"
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Você selecionou o(s) seguinte(s) servidores(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Estes servidores são ativados por padrão. Eles não possuem nenhuma falha\n"
-#~ "de segurança conhecida, mas pode ocorrer de aparecer alguma nova. Neste\n"
-#~ "caso, você deve atualizá-los o mais cedo possível.\n"
-#~ "\n"
-#~ "\n"
-#~ "Você realmente quer instalar estes servidores?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "Ambiente de Trabalho IceWm"
diff --git a/perl-install/install/share/po/ro.po b/perl-install/install/share/po/ro.po
index 68ff22687..123b05033 100644
--- a/perl-install/install/share/po/ro.po
+++ b/perl-install/install/share/po/ro.po
@@ -1,97 +1,82 @@
-# Translation of DrakX.po to Romanian
-# Copyright (c) 1999-2010 Mandriva
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Vă rugăm să nu actualizaţi fișierul, cu excepția cazului în care sînteți
-# sigur de calitatea traducerii dumneavoastră, de gramatică și de ortografie.
-# Acestea din urmă sînt de prea multe ori aproximative.
-# Corectarea lor ulterioară nu are nici un alt rezultat decît acela de
-# pierdere de timp pentru toata lumea.
-#
-# VĂ RUGĂM SĂ RESPECTAȚI SEMNELE DE PUNCTUAȚIE ALE LIMBII ROMÂNE!
-#
-# Nu suprimați spațiul care urmează unui semn de punctuație de sfîrșit de
-# frază; trebuie respectată versiunea originală. În acest caz, este foarte
-# probabil ca programul să afișeze un mesaj la sfîrșit. Suprimînd acel spațiu,
-# cele două cuvintele vor fi afișate legat.
-#
-# Traduceți de manieră INTELIGENTĂ (de ce nu și prin comparație cu alte
-# traduceri ale acestui fișier în alte limbi) și nu cuvînt cu cuvînt. Unele
-# astfel de traduceri nu au nici un sens în limba română.
-#
-# ATENȚIE LA FONTURILE UTILIZATE! Pentru a reda corect diacriticele folosiți
-# disponerea tastaturii românească standard, codarea de caractere UTF-8 și
-# asigurați-vă că fonturile utilizate sînt cu virgulițe, NU CU SEDILE!
-# Exemplu:
-#          font incorect (cu sedile): şŞ ţŢ
-#          font corect (cu virgule): șȘ țȚ
-#
-# Pentru a vă asigura că folosiți fonturile corecte, vizitați:
-#          http://i18n.ro/Fonturi_romanesti/testare
-#
-# Vă mulțumim pentru înțelegere.
-#                                                       Echipa de traducători,
-#                                                       www.Mandrivausers.ro
-#
-# Traducători de-a lungul timpului:
-#
-#
-# Florin Grad <florin@mandriva.com>, 1999-2000.
-# Dragos Marian Barbu <dragosb@softhome.net>, 2000.
-# Ovidiu Constantin <ovidiu.constantin@gmx.net>, 2002, 2003.
-# Harald Ersch <harald@ersch.ro>,2003.
-# Cosmin Humeniuc <cosmin@mandrivausers.ro>, 2008.
-# Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>, 2008, 2009, 2010.
+# Translators:
+# Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>, 2013-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2010-05-21 18:10+0100\n"
-"Last-Translator: Cătălin Florin RUSSEN <cfrussen@yahoo.co.uk>\n"
-"Language-Team: Romanian <cooker-i18n@mandrivalinux.org  >\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-29 14:31+0000\n"
+"Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
+"ro/)\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1))\n"
-"X-Poedit-Language: Romanian\n"
-"X-Poedit-Country: ROMANIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Biroul vostru pe o cheie USB"
+msgid "Join Us!"
+msgstr "Alăturați-vă nouă!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Distribuția Mageia Linux 100%% cu sursă deschisă"
+msgid "Make it yours!"
+msgstr "Personalizați după plac!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Explorați facil Linux cu Mageia One"
+msgid "Your choice!"
+msgstr "Alegerea voastră!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Un birou Mageia Linux complet, cu suport"
+msgid "Office tools"
+msgstr "Unelte de birotică"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: distribuții pentru nevoile fiecăruia"
+msgid "Home entertainment"
+msgstr "Divertisment"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Pentru copii"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Pentru întreaga familie!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Pentru dezvoltatori!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Vă mulțumim!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Fiți liberi!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Mai aveți și alte medii suplimentare?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -99,124 +84,197 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
-"Următoarele medii au fost găsite și vor fi folosite în timpul instalării: "
+"Următoarele medii au fost găsite și vor fi utilizate în timpul instalării: "
 "%s.\n"
 "\n"
 "\n"
 "Aveți un mediu de instalare suplimentar pe care doriți să-l configurați?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Rețea (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Rețea (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Rețea (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Adresa URL a serverului alternativ?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Adresa URL trebuie să înceapă cu ftp:// sau http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Se contactează situl Mageia Linux pentru obținerea listei serverelor "
-"alternative disponibile..."
+"Se contactează situl %s pentru obținerea listei de servere alternative "
+"disponibile ..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Contactarea sitului Mageia Linux pentru obținerea listei serverelor "
-"alternative disponibile a eșuat"
+"Nu s-a putut contacta situl %s pentru obținerea listei de servere "
+"alternative disponibile"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Alegeți un server alternativ de pe care să descărcați pachetele"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Configurare NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Introduceți numele gazdei și directorului mediului NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Lipsește numele gazdei"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Directorul trebuie să înceapă cu \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Numele de gazdă al montajului NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Director"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Suplimentar"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
-"Nu s-a găsit lista de pachete pe aceast server alternativ. Asigurați-vă că "
+"Nu s-a găsit lista de pachete pe acest server alternativ. Asigurați-vă că "
 "adresa este corectă."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Ediția de bază"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Ediția nuanțată"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Ediția proprietară"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Anumite componente materiale din configurația de față necesită un microcod "
+"proprietar pentru funcționarea corectă a piloților."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Ar trebui să activați „%s�"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "„%s� conține diverse părți din sistem și aplicațiile sale"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "„%s� conține aplicații proprietare.\n"
+
+#: any.pm:477
+#, 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 ""
+"Conține și microcod necesar pentru buna funcționare a anumitor dispozitive "
+"(ex: unele plăci grafice ATI/AMD, unele plăci de rețea, unele plăci "
+"RAID, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"„%s� conține aplicații care nu pot fi distribuite în toate țările din cauza "
+"brevetelor."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"Conține și aplicații din „%s� recompilate cu funcționalități suplimentare."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Aici puteți activa mai multe medii dacă doriți."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Acest mediu furnizează actualizări pentru mediul „%s�"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Se caută pachetele deja instalate..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Se caută pachetele de actualizat..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Se înlătură pachetele înainte de actualizare..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -230,87 +288,87 @@ msgstr ""
 "\n"
 "Chiar doriți înlăturarea acestor pachete?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Eroare la citirea fișierului %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Următoarele discuri au fost redenumite:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (denumit anterior %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rețea"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Alegeți un mediu"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "Fișierul există deja. Se spuprascrie?"
+msgstr "Fișierul există deja. Se suprascrie?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permisiune respinsă"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nume NFS greșit"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Mediu incorect %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Nu se pot face capturi de ecran înainte de partiționare"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Capturile de ecran vor fi disponibile după instalare în %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalare"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configurare"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Trebuie să formatați și %s"
@@ -335,22 +393,22 @@ msgstr "Se pornește rețeaua"
 msgid "Bringing down the network"
 msgstr "Se oprește rețeaua"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Așteptați, se preia fișierul"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "mediul nu poate fi adăugat"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Se copiază unele pachete pe discuri pentru utilizare ulterioară"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Copiere în curs"
@@ -380,7 +438,24 @@ msgstr "simpatic"
 msgid "maybe"
 msgstr "eventual"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Se obțin informațiile despre pachet din metadatele XML..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Nu există informații XML pentru mediul „%s�, numai rezultate parțiale pentru "
+"pachetul %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Nici o descriere"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -389,67 +464,76 @@ msgstr ""
 "Unele pachete cerute de %s nu pot fi instalate:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "S-a produs o eroare:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "A apărut o eroare fatală: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Nu mai întreba"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d operațiuni de instalare eșuate"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Instalarea pachetelor a eșuat:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Stație de lucru"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Calculator de birou"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programe de birotică: procesoare de text (OpenOffice.org Writer, Kword), "
-"calcul tabelar (OpenOffice.org Calc, Kspread), vizualizatoare de fișiere pdf "
-"etc."
+"Programe de birotică: procesoare de text (LibreOffice Writer, Kword), calcul "
+"tabelar (LibreOffice Calc, Kspread), vizualizatoare de fișiere PDF, etc."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Stație de jocuri"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programe de amuzament: jocuri de acțiune, table, strategie etc."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Stație multimedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programe de editare/redare sunet și video"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Stație de Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -458,193 +542,193 @@ msgstr ""
 "Set de unelte pentru citire/trimitere de poștă și știri (mutt, tin..) și "
 "navigare pe Internet"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Calculator în rețea (client)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clienți pentru diverse protocoale, inclusiv ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
-msgstr "Unelete pentru a vă ușura configurarea calculatorului"
+msgstr "Unelte pentru a vă ușura configurarea calculatorului"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Unelte de consolă"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editoare, interpretoare, terminale, unelte de fișiere"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Dezvoltare"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Biblioteci de dezvoltare C și C++, programe și fișiere include"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentație"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Cărți și ghiduri despre Linux și programele libere"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Baza standard Linux. Suport pentru aplicații terțe."
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Server Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Lucru colaborativ"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Server Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Parafoc/Ruter"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Pasarelă Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Poștă/Știri"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Serverul de poștă Postfix, serverul de știri Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Server de anuar"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Server de DNS și NIS"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Server de fișiere și de partajare a imprimantei"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server NFS, server Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Bază de date"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Server de baze de date MySQL și PostgreSQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Server de baze de date MariaDB și PostgreSQL"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Poștă electronică"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Serverul de poștă electronică Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Serverul de baze de date MySQL sau PostgreSQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Serverul de baze de date MariaDB sau PostgreSQL"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Server în rețea"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Server NFS, SMB, Proxy, SSH"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Mediu grafic de lucru"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Stație de lucru KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -652,78 +736,135 @@ msgid ""
 msgstr ""
 "Mediul de birou K, mediul grafic de bază cu o colecție de unelte asociate"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Stație de lucru Gnome"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Un mediu grafic cu un set de aplicații prietenoase și unelte de birou"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Stație de lucru XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Un mediu grafic lejer cu un set de unelte de birou și de aplicații "
+"prietenoase"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Stație de lucru MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Stație de lucru Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Un mediu grafic bazat pe GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Birou LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Un port QT de generație nouă a mediului lejer de birou"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Birou Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Un mediu grafic rapid și lejer cu adepți dedicați"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Birou LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Un mediu grafic lejer și rapid"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Birou Plasma"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr ""
-"Un mediu grafic lejer și rapid cu un set de aplicații prietenoase și unelte "
-"de birou"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "Biroul Plasma, mediul grafic de bază cu o colecție de unelte asociate"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Alte medii grafice"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, etc."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utilitare"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Server SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Serverul de configurare distantă Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Utilitare rețea/Supraveghere"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Unelte de supraveghere, evidența proceselor, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Asistenții Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Asistenți pentru configurarea de server"
@@ -737,7 +878,7 @@ msgstr ""
 "S-a produs o eroare, dar nu poate fi interpretată în mod corect.\n"
 "Continuați pe propriul risc."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -757,226 +898,232 @@ msgstr "Se începe etapa „%s�\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Instalare Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "%s instalare %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> între elemente"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Serverul Xorg este încet la pornire. Așteptați vă rog..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Sistemul are resurse puține. Puteți întîmpina probleme la instalarea\n"
-"Mageia Linux. Dacă se întîmplă acest lucru, puteți încerca o instalare\n"
-"în mod text. Pentru aceasta, apăsați „F1� cînd porniți de pe CDROM,\n"
-"apoi introduceți „text�."
+"Sistemul are resurse puține. Este posibil să aveți probleme în timpul "
+"instalării %s.\n"
+"În acest caz puteți încerca o instalare în mod text. Pentru aceasta, apăsați "
+"„F1�\n"
+"la pornirea de pe CD-ROM, apoi introduceți „text�."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Instalare de Mageia cu birou KDE"
+msgid "Media Selection"
+msgstr "Selectare mediu"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Instalare de Mageia cu birou GNOME"
+msgid "Install %s KDE Desktop"
+msgstr "Instalează biroul %s KDE"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Instalează biroul %s GNOME"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Instalare personalizată"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Birou KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Birou GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Birou personalizat"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Iată o previzualizare a biroului „%s�."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Apăsați pe imagini ca să le vedeți mai mari"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Selectare grupuri de pachete"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Selectare individuală a pachetelor"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Mărime totală: %d / %d Mo"
+msgid "Unselect All"
+msgstr "Deselectează tot"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Pachet defectuos"
+msgid "Total size: %d / %d MB"
+msgstr "Mărime totală: %d / %d Mo"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versiune: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Mărime: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d Ko\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Importanță: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Nu puteți selecta/deselecta acest pachet"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "datorită lipsei lui %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "datorită dependenței nesatisfăcute %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "se încearcă promovarea lui %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "pentru a păstra %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Nu puteți selecta acest pachet pentru că nu este destul spațiu pentru a-l "
 "instala"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Următoarele pachetele vor instalate"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Următoarele pachete vor fi înlăturate"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Acesta este un pachet indispensabil și nu poate fi deselectat"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Nu puteți deselecta acest pachet. Este deja instalat"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
-msgstr "Nu puteți deselecta acest pachet. Trebuie acualizat."
+msgid "You cannot unselect this package. It must be upgraded"
+msgstr "Nu puteți deselecta acest pachet. Trebuie actualizat."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Arată pachetele selectate automat"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalare"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Încarcă/Salvează selecția"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Actualizare pachete selectate"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Instalare minimalistă"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
-msgstr "Gestionare de programe"
+msgstr "Gestionare aplicații"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Alegeți pachetele pe care doriți să le instalați"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Se instalează"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Fără detalii"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Timp rămas: "
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(se estimează...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
@@ -984,27 +1131,22 @@ msgstr[0] "%d pachete"
 msgstr[1] "%d pachet"
 msgstr[2] "%d pachete"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Sumar"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configurează"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "neconfigurat"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Selectare mediu"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1013,12 +1155,12 @@ msgstr ""
 "Au fost găsite următoarele medii de instalare.\n"
 "Dacă doriți să săriți peste unele din ele, le puteți deselecta acum."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Aveți opțiunea să copiați conținutul CD-urilor pe discul dur înainte de "
@@ -1026,72 +1168,72 @@ msgstr ""
 "Se va continua de pe discul dur, iar pachetele vor rămîne disponibile după "
 "instalarea sistemului."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copiază CD-urile în întregime"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "S-a produs o eroare"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Alegeți dispunerea tastaturii"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Iată lista tuturor tastaturilor disponibile:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalare/Actualizare majoră"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Este vorba de o instalare sau de o actualizare majoră?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instalare"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Actualizare majoră către %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Cheia de criptare pentru %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Anulează instalarea, repornește sistemul"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Instalare nouă"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Actualizare majoră peste instalarea precedentă (nerecomandat)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1099,47 +1241,27 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Instalatorul a detectat că sistemul Mageia Linux instalat nu suportă o\n"
-"actualizare majoră în siguranță către %s.\n"
+"Instalatorul a detectat că sistemul Mageia Linux instalat actual nu va "
+"putea\n"
+"fi actualizat în siguranță la %s.\n"
 "\n"
-"Se recomandă o instalare nouă, care să înlocuiască pe cea precedentă.\n"
+"Se recomandă o instalare nouă care să o înlocuiască pe cea precedentă.\n"
 "\n"
-"Atenție: ar trebui să vă salvgardați datele personale înainte de a alege "
-"„Instalare\n"
-"nouă�."
+"Atenție: trebuie să vă faceți o copie de siguranță cu toate datele "
+"personale\n"
+"înainte de a alege \"Instalare nouă\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Se configurează IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Nu este spațiu liber pentru 1Mo de bootstrap! Instalarea va continua, dar "
-"pentru a porni sistemul va trebui să creați o partiție de amorsare cu "
-"DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Va trebui creat un PPC PReP Boot bootstrap! Instalarea va continua, dar "
-"pentru a porni sistemul va trebui să creați o partiție de amorsare cu "
-"DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1152,21 +1274,21 @@ msgstr ""
 "Introduceți CD-ul etichetat „%s� și apoi apăsați Ok cînd sînteți gata.\n"
 "Dacă nu-l aveți, apăsați „Anulează� pentru a evita instalarea de pe acest CD."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Se caută pachetele disponibile..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
-"Sistemul vostru nu are suficient spațiu pentru o instalare sau actualizare "
+"Sistemul nu dispune de suficient spațiu pentru o instalare sau actualizare "
 "majoră (%dMo > %dMo)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1175,52 +1297,52 @@ msgstr ""
 "Alegeți încărcarea sau salvarea selecției de pachete.\n"
 "Formatul este același cu fișierele generate de auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Încarcă"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Salvează"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Fișier eronat"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Selectarea biroului"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Puteți alege profilul biroului stației voastre de lucru."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Dimensiunea selectată este mai mare decît spațiul disponibil"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tip de instalare"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1229,87 +1351,115 @@ msgstr ""
 "Nu ați selectat nici un grup de pachete.\n"
 "Alegeți instalarea minimalistă pe care o doriți:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Cu X11"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Instalează pachetele propuse"
+msgid "Install recommended packages"
+msgstr "Instalează pachetele recomandate"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Cu documentația de bază (recomandat!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instalare cu adevărat minimalistă (special fără urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Se pregătește actualizarea majoră..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Se pregătește instalarea"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Se instalează pachetul %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "S-a produs o eroare la ordonarea pachetelor:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
-msgstr "Să se continuie totuși?"
+msgstr "Să se continue totuși?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Reîncearcă"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Ignoră acest pachet"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Ignoră toate pachetele din mediul „%s�"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Înapoi la selectarea mediilor și a pachetelor"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "S-a produs o eroare la instalarea pachetului %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configurare post-instalare"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Asigurați-vă că mediul cu modulele de actualizare este în unitatea %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Actualizări"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Acum aveți posibilitatea să configurați mediile online."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Aceasta vă permite să instalați actualizările de securitate."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Pentru a configura aceste medii va trebui să aveți o conexiune la\n"
+"Internet funcțională.\n"
+"\n"
+"Sigur doriți să configurați mediile de actualizare?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1330,28 +1480,29 @@ msgstr ""
 "\n"
 "Doriți să instalați actualizările?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s pe %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Componente materiale"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Placă de sunet"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Aveți o placă de sunet ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1360,81 +1511,69 @@ msgstr ""
 "Lansați „alsaconf� sau „sndconfig� după instalare pentru a vă configura "
 "placa de sunet"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Nu s-a detectat nici o placă de sunet. Încercați „harddrake� după instalare"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfață grafică"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Rețea & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Servere proxy"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "configurat"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Nivel de securitate"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Parafoc"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "activat"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "dezactivat"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Nu ați configurat X11. Sigur doriți acest lucru?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Se pregătește încărcătorul de sistem..."
+msgid "Preparing initial startup program..."
+msgstr "Se pregătește pornirea programului inițial..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Aveți răbdare, va dura ceva timp..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Se pare că posedați o antichitate sau o mașină necunoscută, încărcătorul de "
-"sistem yatboot nu va funcționa. Instalarea va continua, dar va trebui să "
-"utilizați BootX sau alte mijloace pentru a porni sistemul. Argumentul de "
-"nucleu pentru sistemul de fișiere rădăcină este: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1443,17 +1582,17 @@ msgstr ""
 "La acest nivel de securitate, accesul la fișierele de pe partiția Windows "
 "este permis doar administratorului."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Introduceți o dischetă goală în unitatea %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
-msgstr "Se creează discheta de autoinstalare..."
+msgstr "Se creează discheta de auto-instalare..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1464,12 +1603,12 @@ msgstr ""
 "\n"
 "Chiar vreți să abandonați acum?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Felicitări"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Repornește"
@@ -1564,13 +1703,6 @@ msgid ""
 "Users"
 msgstr "Utilizatori"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Rețea"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1612,49 +1744,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Ieșire"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programe de birotică: procesoare de text (kword, abiword), calcul tabelar "
-#~ "(kspread, gnumeric), vizualizatoare de fișiere pdf etc."
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Ați decis o actualizare majoră a sistemului către %s. KDE 3.5 a fost "
-#~ "detectat\n"
-#~ "pe sistemul dvs. Instalatorul nu poate păstra KDE 3.5 după actualizare. "
-#~ "Dacă procedați, \n"
-#~ "KDE 4 va înlocui KDE 3 și vă veți pierde parametrii personalizați ai "
-#~ "configurației KDE. \n"
-#~ "Pentro o actualizare majoră cu păstrarea lui KDE 3.5 și a parametrilor "
-#~ "personalizați, \n"
-#~ "reporniți sistemul și lansați actualizarea majoră din miniaplicația de "
-#~ "actualizare Mandriva."
-
-#~ msgid "Proceed"
-#~ msgstr "Procedează"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "preluarea lui [%s] a eșuat"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Se descarcă fișierul %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr ""
-#~ "Actualizarea majoră de la o distribuție pe 32 de biți la una pe 64 de "
-#~ "biți nu este suportată."
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr ""
-#~ "Actualizarea majoră de la o distribuție pe 64 de biți la una pe 32 de "
-#~ "biți nu este suportată."
diff --git a/perl-install/install/share/po/ru.po b/perl-install/install/share/po/ru.po
index e585a0e33..448ff0c0e 100644
--- a/perl-install/install/share/po/ru.po
+++ b/perl-install/install/share/po/ru.po
@@ -1,62 +1,91 @@
-# translation of ru.po to Russian
-# Translation of DrakX messages to Russian
-# Copyright (C) 1999-2003 Mandriva
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Pavel Maryanov <acid_jack@ukr.net>, 2002-2009.
-# Alice Lafox <alice@lafox.com.ua>, 2003.
-# Alice Lafox <alice@lafox.net>, 2004, 2005.
-# Alexander Kuzmenkov <rc@mezon.ru>, 2007.
-# akdengi <kazancas@mandriva.ru>, 2008, 2009.
-# akdengi <kazancas@gmail.com>, 2008.
-# Alexander Kazancev <kazancas@gmail.com>, 2008.
+# Translators:
+# akdengi <kazancas@gmail.com>, 2008
+# Alexander Kazancev <kazancas@mandriva.ru>, 2008-2009
+# Alexander Kazancev <kazancas@gmail.com>, 2008
+# Alexander Kuzmenkov <rc@mezon.ru>, 2007
+# Alice Lafox <alice@lafox.com.ua>, 2003
+# Alice Lafox <alice@lafox.net>, 2004-2005
+# Boris Zhalilo <daviongm@gmail.com>, 2014
+# �натолий Валерианович <ffox909@mail.ru>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: ru\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-09-15 01:40+0500\n"
-"Last-Translator: akdengi <kazancas@mandriva.ru>\n"
-"Language-Team: Russian <gnu@mx.ru>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-06-23 14:14+0300\n"
+"Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/mageia/language/"
+"ru/)\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n"
-"\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
+"X-Generator: Poedit 1.6.9\n"
+
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr "При�оедин�йте�ь к нам!"
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr "Под�тройте �и�тему под �еб�!"
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr "Выбор за Вами!"
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, c-format
+msgid "Office tools"
+msgstr "Офи�ные ин�трументы"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr "Домашн�� развлекательна� �и�тема"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Рабоча� �и�тема на USB-брелоке"
+msgid "For kids"
+msgstr "Дл� детей"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "100%% открытый ди�трибутив Mageia Linux"
+msgid "For family!"
+msgstr "Дл� �емьи!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Открой Linux � Mageia One"
+msgid "For developers!"
+msgstr "Дл� разработчиков!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Полный ди�трибутив Mageia Linux � поддержкой"
+msgid "Thank you!"
+msgstr "Спа�ибо!"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: ди�трибутив дл� каждого"
+msgid "Be Free!"
+msgstr "Будьте �вободными!"
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Е�ть дополнительный но�итель?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -70,93 +99,91 @@ msgstr ""
 "\n"
 "Е�ли ли дополнительный но�итель дл� на�тройки?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Сеть (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Сеть (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Сеть (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "�дре� зеркала?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "�дре� должен начинать�� � ftp:// или http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"У�танавливает�� �оединение � веб-�айтом Mageia Linux дл� загрузки �пи�ка "
-"до�тупных пакетов..."
+"У�танавливает�� �оединение � веб-�айтом %s дл� загрузки �пи�ка до�тупных "
+"пакетов..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"�е удало�ь �оединить�� � веб-�айтом Mageia Linux, чтобы загрузить �пи�ок "
-"до�тупных зеркал"
+"�е удало�ь �оединить�� � веб-�айтом %s, чтобы загрузить �пи�ок до�тупных "
+"зеркал"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Выберите зеркало, � которого будут загружены пакеты"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "�а�тройка NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Укажите им� компьютера и каталог ре�ур�а NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "�е указано им� компьютера"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Им� каталога должно начинать�� � \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Им� компьютера дл� монтировани� NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Каталог"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Дополнительный"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -165,23 +192,101 @@ msgstr ""
 "�евозможно найти �пи�ок пакетов на �том зеркале. Проверьте правильно�ть "
 "адре�а."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Дл� работы ча�ти оборудовани� на компьютере �ледует у�тановить "
+"микропрограммы � закрытым кодом, необходимые дл� работы драйверов � открытым "
+"кодом."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Следует включить \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "В \"%s\" �одержат�� различные ча�ти операционной �и�темы и её программ"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "В \"%s\" �одержат�� не�вободные программы.\n"
+
+#: any.pm:477
+#, 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, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"В \"%s\" �одержат�� пакеты � программным обе�печением, которое нельз� "
+"�вободно ра�про�тран�ть в некоторых �транах из-за нарушени� патентных прав "
+"на �то программное обе�печение."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"Также в \"%s\" �одержат�� пакеты, �обранные � дополнительными возможно�т�ми, "
+"и�пользование которых ограничивает�� патентами."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Зде�ь вы можете включить дополнительные хранилища, е�ли �то вам нужно."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "В �том и�точнике �одержат�� обновлени� пакетов из и�точника \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Выполн�ет�� пои�к у�тановленных пакетов..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Выполн�ет�� пои�к пакетов дл� обновлени�..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -194,87 +299,87 @@ msgstr ""
 "\n"
 "Удалить �ти пакеты?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Ошибка при чтении файла %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Следующие ди�ки были переименованы:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (ранее называл�� %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Сеть"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Выберите но�итель"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Файл уже �уще�твует. Перепи�ать его?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "До�туп запрещён"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "�еверное им� NFS"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "�еверный и�точник %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "�евозможно �оздать �криншоты перед разметкой ди�ка"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "По�ле у�тановки �криншоты будут находить�� в каталоге %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "У�тановка"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "�а�тройка"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Также необходимо отформатировать %s"
@@ -299,22 +404,22 @@ msgstr "Поднимает�� �еть"
 msgid "Bringing down the network"
 msgstr "Опу�кает�� �еть"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Подождите, идёт загрузка"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "не удало�ь добавить и�точник"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "�а ди�к копируют�� пакеты дл� и�пользовани� в будущем"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Идёт копирование"
@@ -344,7 +449,24 @@ msgstr "желательно"
 msgid "maybe"
 msgstr "может быть"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Получени� данных о пакетах из метаданных XML..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"дл� и�точника «%s» от�ут�твует xml-info; дл� пакета %s получен только "
+"ча�тичный результат"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Опи�ани� нет"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -353,67 +475,77 @@ msgstr ""
 "�екоторые пакеты, запрошенные %s, не могут быть у�тановлены:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Произошла ошибка:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Произошла критиче�ка� ошибка: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Больше не �прашивать"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d у�тановочных транзакций не удали�ь"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "�е удало�ь у�тановить пакет:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Рабоча� �танци�"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Офи�на� рабоча� �танци�"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Офи�ные программы: тек�товые проце��оры (OpenOffice.org Writer, Kword), "
-"�лектронные таблицы (OpenOffice.org Calc, Kspread), программы дл� про�мотра "
-"pdf и т.д."
+"Офи�ные программы: тек�товые проце��оры (LibreOffice Writer, Kword), "
+"�лектронные таблицы (LibreOffice Calc, Kspread), программы дл� про�мотра pdf "
+"и т.д."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Игровой компьютер"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Развлекательные программы: аркады, на�тольные игры, �тратегии и т.д."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Мультимедийный компьютер"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Программы дл� во�произведени�/редактировани� звука и видео"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Интернет-компьютер"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -421,193 +553,193 @@ msgid ""
 msgstr ""
 "�абор программ дл� работы � корре�понденцией (mutt, tin...) и веб-�ерфинга"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Сетевой компьютер (клиент)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клиенты дл� различных протоколов, включа� ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Утилиты дл� облегчени� на�тройки компьютера"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Утилиты дл� кон�оли"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Разработка"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Документаци�"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Книги и документаци� по Linux и �вободному программному обе�печению"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Поддержка приложений �торонних разработчиков."
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Веб-�ервер"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "ПО дл� �овме�тной работы"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Сервер Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Файервол/Маршрутизатор"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Интернет-шлюз"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Почта/�ово�ти"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Почтовый �ервер Postfix, �ервер ново�тей Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Служба каталогов"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Сервер FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Сервер доменных имен и �етевые информационные �лужбы (NIS)"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Сервер общего до�тупа к файлам и принтерам"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "База данных"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Сервер баз данных PostgreSQL и MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Сервер баз данных PostgreSQL и MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Веб/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Почта"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Почтовый �ервер Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Сервер баз данных PostgreSQL или MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Сервер баз данных PostgreSQL или MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Сетевой �ервер"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Cервер NFS, �ервер SMB, прок�и-�ервер, �ервер SSH"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Графиче�кое окружение"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Рабоча� �танци� KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -616,12 +748,12 @@ msgstr ""
 "K Desktop Environment - о�новна� графиче�ка� �реда � коллекцией "
 "�опроводительных утилит"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Рабоча� �танци� Gnome"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -630,66 +762,124 @@ msgstr ""
 "Графиче�ка� �реда � удобным дл� пользовател� набором приложений и утилит "
 "рабочего �тола"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Рабоча� �танци� XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Более лёгка� графиче�ка� �реда � удобным набором приложений и ин�трументов"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Рабоча� �танци� MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Рабоча� �танци� Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Графиче�кое окружение на о�нове GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "LXQT Desktop"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "У�овершен�твованный QT-порт легкове�ной �реды рабочего �тола"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Рабочий �тол Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Легка� и бы�тра� графиче�ка� �реда"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Рабочий �тол LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Бы�тра� и нетребовательна� к ре�ур�ам графиче�ка� оболочка"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasma Desktop"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Про�та� и бы�тра� графиче�ка� �реда � удобным дл� пользовател� набором "
-"приложений и на�тольными программами"
+"Базова� графиче�ка� �реда Plasma Desktop и набор ин�трументов дл� работы � "
+"ней"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Другие графиче�кие рабочие �толы"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm и т.п."
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm и т.п."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Утилиты"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Сервер SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Сервер удалённой на�тройки Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Сетевые утилиты/Мониторинг"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Утилиты мониторинга, учёт проце��ов, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Ма�теры на�тройки Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Ма�теры на�тройки �ервера"
@@ -703,7 +893,7 @@ msgstr ""
 "Произошла ошибка, но � не знаю, как её корректно обработать.\n"
 "Продолжайте на �вой �об�твенный �трах и ри�к."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -723,251 +913,253 @@ msgstr "Выполн�ет�� переход на �тап `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "У�тановка Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "У�тановка %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> между �лементами"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg-�ервер долго запу�кает��. Подождите..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Си�теме не хватает ре�ур�ов. Во врем� у�тановки Mageia Linux могут\n"
+"Си�теме не хватает ре�ур�ов. Во врем� у�тановки %s могут\n"
 "возникнуть проблемы. В �том �лучае можно попробовать у�тановку в\n"
 "тек�товом режиме. Дл� �того по�ле загрузки � ди�ка нажмите `F1',\n"
 "а затем наберите 'text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "У�тановить рабочий �тол KDE"
+msgid "Media Selection"
+msgstr "Выбор и�точника"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "У�тановить рабочий �тол GNOME"
+msgid "Install %s KDE Desktop"
+msgstr "У�тановить %s рабочий �тол KDE"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "У�тановить %s рабочий �тол GNOME"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Выборочна� у�тановка"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Рабочий �тол KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Рабочий �тол GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Другой рабочий �тол"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Это предварительный вид рабочего �тола '%s."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Щёлкните картинку, чтобы увеличить её"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Выбор групп пакетов"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Выбор отдельных пакетов"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Общий объём: %d / %d МБ"
+msgid "Unselect All"
+msgstr "Сн�ть выделение �о в�ех"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "�екорректный пакет"
+msgid "Total size: %d / %d MB"
+msgstr "Общий объём: %d / %d МБ"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Вер�и�:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Размер:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d КБ\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Важно�ть: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Этот пакет нельз� выбрать/отменить"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "из-за от�ут�тви� %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "из-за неудовлетворенных %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "выполн�ет�� попытка активизировать %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "чтобы �охранить %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Этот пакет нельз� выбрать, т.к. дл� его у�тановки не хватает ме�та"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Будут у�тановлены �ледующие пакеты "
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Будут удалены �ледующие пакеты "
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Этот пакет �вл�ет�� об�зательным, его нельз� пропу�тить"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Этот пакет нельз� убрать, потому что он уже у�тановлен"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Этот пакет нельз� убрать, потому что он должен быть обновлен"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Показывать автоматиче�ки выбранные пакеты"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "У�тановить"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Загрузить/Сохранить выбор"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Обновл�ет�� выбор пакетов"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Минимальна� у�тановка"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Управление ПО"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Выберите пакеты, которые нужно у�тановить"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "У�тановка"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Убрать подробно�ти"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "О�тавшее�� врем�:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(вычи�л�ет��...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d пакет"
-msgstr[1] "%d пакетов"
+msgstr[1] "%d пакеты"
+msgstr[2] "%d пакеты"
+msgstr[3] "%d пакеты"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Сводка"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "�а�тройка"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "не на�троен"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Выбор и�точника"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -976,12 +1168,12 @@ msgstr ""
 "�айдены �ледующие и�точники дл� у�тановки.\n"
 "Е�ли нужно пропу�тить некоторые из них, �ейча� � них можно �н�ть флажки."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Содержимое компакт-ди�ка перед у�тановкой можно �копировать на жё�ткий "
@@ -989,72 +1181,72 @@ msgstr ""
 "По�ле �того у�тановка продолжит�� � жё�ткого ди�ка, и пакеты будут до�тупны "
 "по�ле полной у�тановки �и�темы."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Целиком �копировать компакт-ди�ки"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Произошла ошибка"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Выберите ра�кладку клавиатуры"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Полный �пи�ок до�тупных ра�кладок:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "У�тановка/Обновление"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Это у�тановка или обновление?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "У�тановка"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Обновление %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Ключ шифровани� дл� %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Отмена у�тановки, перезагрузка �и�темы"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "�ова� у�тановка"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Обновление предыдущей у�тановки (не рекомендует��)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1062,7 +1254,7 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"У�тановщик обнаружил, что �уще�твующа� у�тановка Mageia Linux не\n"
+"У�тановщик обнаружил, что �уще�твующа� у�тановка Mageia не\n"
 "может быть безопа�но обновлена на %s.\n"
 "\n"
 "Рекомедует�� заново у�тановить �и�тему, заменив �уще�твующую.\n"
@@ -1071,38 +1263,17 @@ msgstr ""
 "выбором \"�ова�\n"
 "У�тановка\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "�а�траивает�� IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"�едо�таточно �вободного ме�та дл� программы �амозагрузки! У�тановка "
-"продолжит��, но дл� загрузки �и�темы будет необходимо �оздать раздел "
-"начальной загрузки в DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"�еобходимо �оздать загрузочный раздел PPC PReP! У�тановка продолжит��, но "
-"дл� загрузки �и�темы нужно будет �оздать раздел начальной загрузки в "
-"DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1116,12 +1287,12 @@ msgstr ""
 "Е�ли у ва� его нет, нажмите 'Отмена', чтобы отказать�� от у�тановки � �того "
 "ди�ка."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Пои�к до�тупных пакетов..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1130,7 +1301,7 @@ msgstr ""
 "В вашей �и�теме недо�таточно �вободного ди�кового про�тран�тва дл� у�тановки "
 "или обновлени� (%d МБ > %d МБ)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1139,52 +1310,52 @@ msgstr ""
 "Выберите загрузку или �охранение выбора пакетов.\n"
 "Формат файлов такой же, как и у �озданных при автоматиче�кой у�тановке."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Загрузить"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Сохранить"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "�еверный файл"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Выбор рабочего �тола"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Можно выбрать профиль на�тольной �реды."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Выбранный размер превышает до�тупное ме�то"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Тип у�тановки"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1193,87 +1364,115 @@ msgstr ""
 "�е была выбрана ни одна группа пакетов.\n"
 "Выберите тип минимальной у�тановки:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "С Х-�ервером"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "У�тановка предлагаемых пакетов"
+msgid "Install recommended packages"
+msgstr "У�тановить рекомендуемые пакеты"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "С о�новной документацией (рекомендует��)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Дей�твительно минимальна� у�тановка (даже без urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Подготавливает�� обновление..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Подготовка к у�тановке"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "У�танавливает�� пакет %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "При загрузке пакетов возникла ошибка:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "В�ё равно продолжить?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Повторить"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Пропу�тить �тот пакет"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Пропу�тить в�е пакеты из и�точника \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Вернуть�� к выбору и�точника и пакетов"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "При у�тановке пакета %s возникла ошибка."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "�а�тройка по�ле у�тановки"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Проверьте наличие но�ител� 'Update Modules' в у�трой�тве %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Обновлени�"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Теперь у ва� е�ть возможно�ть �конфигурировать интернет и�точники."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Это позвол�ет у�тановить обновлени� безопа�но�ти."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Чтобы �конфигурировать �ти и�точники вы должны иметь \n"
+"работающее интернет �оединение.\n"
+"\n"
+"Вы хотите �конфигурировать и�точники � обновлени�ми?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1294,28 +1493,29 @@ msgstr ""
 "\n"
 "У�тановить �ти обновлени�?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Оборудование"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Звукова� карта"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Е�ть ли у ва� звукова� карта ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1324,82 +1524,70 @@ msgstr ""
 "Дл� на�тройки звуковой карты запу�тите по�ле у�тановки утилиту \"alsaconf\" "
 "или \"sndconfig\"."
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Звукова� карта не обнаружена. Попробуйте запу�тить по�ле у�тановки утилиту "
 "\"harddrake\" "
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Графиче�кий интерфей�"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Сеть и Интернет"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Прок�и"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "на�троен"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Уровень безопа�но�ти"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Файервол"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "включен"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "выключен"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Х-�ервер ещё не на�троен. Вы точно уверены в �воих дей�тви�х?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Подготавливает�� начальный загрузчик..."
+msgid "Preparing initial startup program..."
+msgstr "Подготовка начального загрузчика..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Подождите, �то может зан�ть некоторое врем�..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Похоже, что вы �вл�ете�ь обладателем очень �тарой или неизве�тной машины, на "
-"которой начальный загрузчик 'yaboot' не будет работать. У�тановка "
-"продолжит��, однако дл� загрузки придёт�� и�пользовать загрузчик 'BootX' или "
-"какой-то другой. Параметр �дра дл� корневой файловой �и�темы: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1408,17 +1596,17 @@ msgstr ""
 "�а данном уровне безопа�но�ти до�туп к файлам на разделе Windows разрешён "
 "только админи�тратору. "
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "В�тавьте чи�тую ди�кету в ди�ковод %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Создает�� ди�кета автоматиче�кой у�тановки..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1429,12 +1617,12 @@ msgstr ""
 "\n"
 "Дей�твительно завершить работу?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Поздравл�ем"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Перезагрузка"
@@ -1529,13 +1717,6 @@ msgid ""
 "Users"
 msgstr "Пользователи"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Сеть"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1578,9 +1759,5 @@ msgid ""
 "Exit"
 msgstr "Выход"
 
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Офи�ные программы: тек�товые проце��оры (kword, abiword), �лектронные "
-#~ "таблицы (kspread, gnumeric), программы дл� про�мотра pdf и т.д."
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Подготавливает�� начальный загрузчик..."
diff --git a/perl-install/install/share/po/sc.po b/perl-install/install/share/po/sc.po
index 19794d162..b53bc8954 100644
--- a/perl-install/install/share/po/sc.po
+++ b/perl-install/install/share/po/sc.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-sc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2005-09-14 11:29+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -16,38 +16,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -56,114 +81,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Arretza (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Arretza (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Arretza (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL de su sprigu?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Cuntatu su jassu web de Mageia Linux po tenni sa lista de is sprigus..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Cuntatu su jassu web de %s po tenni sa lista de is sprigus..."
 
-#: any.pm:187
+#: any.pm:253
 #, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr ""
-"Cuntatu su jassu web de Mageia Linux po tenni sa lista de is sprigus..."
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr "Cuntatu su jassu web de %s po tenni sa lista de is sprigus..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Assètiu NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Directory"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Càstiu is pakitus jai aposentaus..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Agatu is pakitus po ajorronai..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Srèxinu is pakitus ki dui funt po ajorronai..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -172,87 +260,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Faddina ligendi su file %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Apu arrenominau is discus ki sighint:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (innantis nominau %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Arretza"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Sçobera unu suportu, po praxeri"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Su file esistit jai. Nci scriu apitzus?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permissu dennegau"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr ""
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "No fait a fai fotografias innantis de pratzidurai"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "As a podi biri is fotografias apustis de s'aposentada in %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "Seu aposentendi"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Assètiu"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Depis formatai %s puru"
@@ -276,22 +364,22 @@ msgstr "Alluu s'arretza"
 msgid "Bringing down the network"
 msgstr "Studu s'arretza"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Còpia in cursu"
@@ -321,340 +409,422 @@ msgstr ""
 msgid "maybe"
 msgstr ""
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Nisçuna descriidura"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Faddina"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Faddina mortali: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transatzionis de aposentadura faddias"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Sçobera tipu de aposentadura"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Workstation"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"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:26
 #, c-format
 msgid "Game station"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, fuzzy, c-format
 msgid "Multimedia station"
 msgstr "Multimedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, fuzzy, c-format
 msgid "Internet station"
 msgstr "Intrenatzionallisadura"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, 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:42
 #, fuzzy, c-format
 msgid "Network Computer (client)"
 msgstr "Informàtiga"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, fuzzy, c-format
 msgid "Console Tools"
 msgstr "Console"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Adelantamentu"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documentadura"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Server Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Traballu in Grupu"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Server Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Gateway po Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Curreu/Noas"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Server de curreu Postfix, server de noas Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Server de Directory"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Server NFS, server Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Server po Database PostGreSQL e MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Server po Database PostGreSQL e MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Curreu"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Server de curreu Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server po Database PostGreSQL e MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Server po Database PostGreSQL e MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, fuzzy, c-format
 msgid "Network Computer server"
 msgstr "Informàtiga"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Ambienti Gràfigu"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE Workstation"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME Workstation"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, 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:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE Workstation"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME Workstation"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Workstation"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Ambienti Gràfigu"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "IceWm Desktop"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "IceWm Desktop"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Ambienti Gràfigu"
+
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "IceWm Desktop"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Atras scrianias gràfigas"
 
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:200
+#, 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:223
 #, c-format
 msgid "Utilities"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Server SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr ""
@@ -668,7 +838,7 @@ msgstr ""
 "Faddina. No sciu comenti ndi bessiri beni.\n"
 "Sighi a perìgulu tuu."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -684,329 +854,329 @@ msgstr ""
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Aposentadura de Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Aposentadura de %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> intr''e elementus"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Càrriga/Sarva su sçoberu"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Aposentadura minimali"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "IceWm Desktop"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "IceWm Desktop"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "IceWm Desktop"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr ""
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Sçoberu pakitus unu a unu"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Mesura totali: %d / %d MB"
+msgid "Unselect All"
+msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Pakitu malu"
+msgid "Total size: %d / %d MB"
+msgstr "Mesura totali: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versioni: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Mesura: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Importu: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "No podis scerai/disiscerai custu pakitu"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "ca amancat %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "ca no est satisfatu %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "provu a sçoberai %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "po podi apoderai %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "No podis sçoberai custu pakitu, ca no dui at spàtziu abasta po d'aposentai"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Megu a aposentai is pakitus ki sighint"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Megu a srexinai is pakitus ki sighint"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Custu est unu palitu necessàriu, no fait a du disiscerai"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "No fait a disiscerai custu pakitu. Est jai aposentau"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "No fait a disiscerai custu pakitu. Bolit ajorronau"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Amosta in automàtigu is pakitus sçoberaus"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Aposenta"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Càrriga/Sarva su sçoberu"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Ajorronu su sçoberu de is pakitus"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Aposentadura minimali"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Maniju de is programas"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Sçobera is pakitus ki bolis aposentai"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Seu aposentendi"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr ""
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Tempus ki abarrat "
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Seu carculendi"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakitus"
 msgstr[1] "%d pakitus"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Arresùmini"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Assètia"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "no assetiau"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Càrriga/Sarva su sçoberu"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Còpia totu is CD"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Faddina"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Sçobera su skema de su tecrau"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Innoi sa lista de totu is tecraus a disposta"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Aposenta/Ajorrona"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Est una aposentadura o una ajorronadura?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Aposenta"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Ajorrona %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Crai de cuadura po %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Seu aposentendi"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1015,32 +1185,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Assètiu IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1052,158 +1207,182 @@ msgstr ""
 "Intra su Cd-Rom etiketau \"%s\" in su ligidori e craca Ok candu as fatu.\n"
 "Ki no du tenis, craca Annudda po scampai s'aposentadura de custu Cd-Rom."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr ""
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Càrriga"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Sarva"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "File malu"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipu de aposentadura"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Cun X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Amosta in automàtigu is pakitus sçoberaus"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Apariçu su bootloader..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Apariçu s'aposentadura"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Faddina in s'ordinadura de is pakitus:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Sigu comuncas?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Arrecasça"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Sarva su sçoberu de is pakitus"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Faddina in s'aposentadura de is pakitus:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Assètiu pusti-aposentadura"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Ajorronus"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1216,121 +1395,114 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s in %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Skeda de Sonu"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Tenis una skeda de sonu ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfaci Gràfiga"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Arretza & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxy"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "assetiau"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Arrasu de Siguresa"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "abivau"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "disabivau"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "No as assetiau ancora X. Siguru ses ca bolis custu?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Apariçu su bootloader..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Apariçu s'aposentadura"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Intra unu floppy sbuidu in su trastu %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr ""
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1338,12 +1510,12 @@ msgid ""
 "Do you really want to quit now?"
 msgstr ""
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Cumprimentus"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Torra a allui"
@@ -1438,13 +1610,6 @@ msgid ""
 "Users"
 msgstr "Umperadoris"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Arretza"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1487,6 +1652,28 @@ msgid ""
 "Exit"
 msgstr "Bessi"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Apariçu su bootloader..."
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "IceWm Desktop"
+
+#~ msgid "Welcome"
+#~ msgstr "Beni beniu"
+
+#~ msgid "Bad package"
+#~ msgstr "Pakitu malu"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Apariçu su bootloader..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Arretza"
+
 #~ msgid "IceWm Desktop"
 #~ msgstr "IceWm Desktop"
 
diff --git a/perl-install/install/share/po/sk.po b/perl-install/install/share/po/sk.po
index bada3a0b9..186e89d6d 100644
--- a/perl-install/install/share/po/sk.po
+++ b/perl-install/install/share/po/sk.po
@@ -1,54 +1,85 @@
-# Jan Matis <damned@hq.alert.sk>, 2000.
-# Pavol Cvengros <orpheus@hq.alert.sk>, 2000.
-# Michal Holes <Michal@Holes.sk>, 2004,2005.
-# Tibor Pittich <Tibor.Pittich@phuture.sk>, 2002,2003,2004,2005.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Jan Matis <damned@hq.alert.sk>, 2000
+# Michal Holes <Michal@Holes.sk>, 2004-2005
+# Milan Baša <minkob@mail.t-com.sk>, 2015
+# Pavol Cvengros <orpheus@hq.alert.sk>, 2000
+# Tibor Pittich <Tibor.Pittich@phuture.sk>, 2002-2005
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2005-09-21 14:03+0100\n"
-"Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
-"Language-Team:  <i18n@mandrake.sk>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-07-15 19:14+0000\n"
+"Last-Translator: Milan Baša <minkob@mail.t-com.sk>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/mageia/language/"
+"sk/)\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
+msgid "Join Us!"
+msgstr "Pridajte sa k nám!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr ""
+msgid "Make it yours!"
+msgstr "Zosobnite si!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr ""
+msgid "Your choice!"
+msgstr "Vaša voľba!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr ""
+msgid "Office tools"
+msgstr "Kancelárske nástroje"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr ""
+msgid "Home entertainment"
+msgstr "Domáca zábava"
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Pre deti"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Pre rodinu"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Pre vývojárov"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Ďakujeme Vám!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Cíťte sa voľný!"
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Máte ešte nejaké �alšie doplňujúce médiá?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -56,115 +87,188 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
+"Boli nájdené �alšie médiá ktoré budú použité po�as inštalácie: %s.\n"
+"\n"
+"\n"
+"Máte nejaké doplňujúce médium na konfiguráciu?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Sieť (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Sieť (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Sieť (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
-msgstr "URL zrkadliaceho servera"
+msgstr "URL zrkadliaceho servera?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
-msgstr ""
+msgstr "URL musí za�ínať s ftp:// alebo http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Pripájam sa k web stránke Mageia Linux pre stiahnutie zoznamu zrkadiel..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Pripájam sa k web stránke %s pre stiahnutie zoznamu zrkadiel..."
 
-#: any.pm:187
-#, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr ""
-"Pripájam sa k web stránke Mageia Linux pre stiahnutie zoznamu zrkadiel..."
+#: any.pm:253
+#, c-format
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr "Zlyhalo pripojenie ku web stránke %s pre stiahnutie zoznamu zrkadiel"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
-msgstr "Vyberte miror, z ktorého si chcete stiahnuť balíky"
+msgstr "Vyberte zrkadlo, z ktorého si chcete stiahnuť balíky"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Nastavenie NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Zadajte prosím meno hostiteľa a prie�inok pre vaše NFS médium"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
-msgstr ""
+msgstr "Chýba meno hostiteľa"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
-msgstr ""
+msgstr "Adresár musí za�ínať s \"/\" "
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Meno hostiteľa pre NFS bod pripojenia ?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
-msgstr "Prie�inok"
+msgstr "Adresár"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
-msgstr ""
+msgstr "Doplňujúci"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Nie je možné nájsť súbor hdlist na tomto zrkadliacom servery"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Niektoré hardvérové sú�asti na vašom po�íta�i potrebujú nie slobodný (non "
+"free) firmvér na to, aby mohli fungovať niektoré slobodné (free) ovláda�e. "
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Mali by ste povoliť \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" obsahuje rôzne �asti systémov a ich aplikácie "
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" obsahuje nie slobodný (non free) softvér.\n"
+
+#: any.pm:477
+#, 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 ""
+"Obsahuje tiež firmvér potrebný rôznymi zariadeniami k ich práci (napr. ATI/"
+"AMD grafické karty, niektoré sieťové karty, RAID karty, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" obsahuje softvér ktorý nemôže byť distribuovaný v každej krajine "
+"kvôli softvérovým patentom."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "Tiež obsahuje prebudovaný softvér z \"%s\" s dodato�nými možnosťami."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Tu môžete povoliť �alšie zdroje ak si prajete."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Tento zdroj poskytuje aktualizácie pre zdroj \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Hľadám balíky, ktoré sú už nainštalované..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Hľadám balíky pre aktualizáciu..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Odstránenie balíkov pred aktualizáciou..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -173,92 +277,92 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 "Nasledovné balíky budú musieť byť odinštalované aby bolo možné vykonať "
-"upgrade vášho systému: %s\n"
+"aktualizáciu vášho systému: %s\n"
 "\n"
 "\n"
 "Chcete naozaj tieto balíky odinštalovať?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
-msgstr "chyba pri �ítaní zo súboru %s"
+msgstr "Chyba pri �ítaní zo súboru %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Nasledovné disky boli premenované:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (predtým ako %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Sieť"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Vyberte si zdroj"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Súbor už existuje. Prepísať?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Nesprávne NFS meno"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Zlý zdroj %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Nemôžem spraviť kópie obrazovky pred rozdelením disku"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Kópie obrazovky budú po inštalácii dostupné v %s"
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
-msgstr "Inštalujem"
+msgstr "Inštalaácia"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurácia"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Taktiež musíte naformátovať %s"
@@ -280,24 +384,25 @@ msgstr "Spúšťam prácu so sieťou"
 #: interactive.pm:27
 #, c-format
 msgid "Bringing down the network"
-msgstr "Ukon�uje sa prácu so sieťou"
+msgstr "Ukon�uje sa práca so sieťou"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
-msgstr ""
+msgstr "Prosím �akajte, získava sa súbor"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr ""
+msgstr "Nie je možné pridať zdroj"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
+"Prebieha kopírovanie niektorých balí�kov na disk kvôli budúcemu použitiu"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Prebieha kopírovanie"
@@ -327,73 +432,102 @@ msgstr "zaujímavé"
 msgid "maybe"
 msgstr "možno.."
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Získavanie informácií o balí�ku z XML meta-dát..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Žiadne xml informácie pre médium \"%s\", iba �iasto�né informácie pre balík "
+"%s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Bez popisu"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
+"Niektoré balíky vyžadované %s nemôžu byť nainštalované:\n"
+"%s"
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "Vyskytla sa chyba"
+msgstr "Nastala chyba:"
+
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Nastala fatálna chyba: %s"
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Nepýtať sa znovu"
 
-#: pkgs.pm:814
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d inštala�ná transakcia zlyhala"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "Inštaluje sa balík %s"
+msgstr "Zlyhala inštalácia balíkov:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Pracovná stanica"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Kancelárska stanica"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Kancelárske programy: editory (OpenOffice.org Writer, Kword), tabuľkové "
-"procesory (OpenOffice.org Calc, Kspread), pdf prehliada�e, at�"
+"Kancelárske programy: editory (LibreOffice Writer, Kword), tabuľkové "
+"procesory (LibreOffice Calc, Kspread), pdf prehliada�e, at�"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Hracia stanica"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zábavne programy: stolové, stratégie, at�"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediálna stanica"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programy na prehrávanie/editovanie zvuku a videa"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internetová stanica"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -402,193 +536,193 @@ msgstr ""
 "Nástroje na �ítanie a posielanie emailov a news správ (mutt, tin..) a "
 "prehliadanie www"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Sieťovy po�íta� (klient)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
-msgstr "Klientovia pre rôzne protokoly vrátane ssh"
+msgstr "Klienti pre rôzne protokoly vrátane ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Nástroje na jednoduchú konfiguráciu vášho po�íta�a"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konzolové nástroje"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editory, shelly, súborové nástroje, terminály"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Vývojárska"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C a C++ vývojove knižnice, programy a include súbory"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentácia"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Knihy a návody pre Linux a iný voľný softvér"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Aplika�ná podpora od tretej strany"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Web server"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Brána k Internetu"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Mail/News"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix poštový systém, Inn news server"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Adresárový server"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP server"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Server doménových mien a sieťový informa�ný server (NIS)"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Súborový a tla�ový server"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Databázy"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Databázový server PostgreSQL a MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Databázový server PostgreSQL a MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache a Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Mail"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix mail server"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL, alebo MySQL databázový server"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL, alebo MariaDB databázový server"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Sieťový server"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafické prostredie"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE pracovná stanica"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -596,76 +730,134 @@ msgid ""
 msgstr ""
 "K Desktop Enviroment, grafické prostredie s množstvom pribalených programov"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME pracovná stanica"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Grafické rozhranie s aplikáciami a desktopovými nástrojmi"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "XFCE pracovná stanica"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr "Odľah�ené grafické prostredie s uživateľsky príjemnou sadou aplikácií"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "MATE pracovná stanica"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Cinnamon pracovná stanica"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Grafické prostredie založené na GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "LXQT grafická plocha"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Ďalšia generácia QT portu odľah�enej grafickej plochy"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Enlightenment e17 grafická plocha"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Odľah�ené rýchle grafické prostredie"
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "Pracovná plocha IceWm"
+msgstr "LXDE grafická plocha"
+
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Odľah�ené rýchle grafické prostredie"
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasma grafická plocha"
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr "Grafické rozhranie s aplikáciami a desktopovými nástrojmi"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"Plasma grafická plocha, základné grafické prostredie s množstvom nástrojov "
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Iné grafické prostredia"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, at�"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, at�."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Utility"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH server"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Vzdialená konfigurácia servera pomocou Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Sieťové utility/Monitoring"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Monitorovacie nástroje, ú�tovanie procesov, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Sprievodcovia Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Sprievodcovia pre konfiguráciu servera"
@@ -679,7 +871,7 @@ msgstr ""
 "Vyskytla sa chyba a neviem ju úplne vyriešiť.\n"
 "Pokra�ujte na vlastnú zodpovednosť."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -698,253 +890,252 @@ msgstr "Spúšťam krok %s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Inštalácia Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Inštalácia %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> medzi položkami"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
-msgstr ""
+msgstr "Xorg server štartuje pomaly. Prosím �akajte..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Váš systém má nedostatok prostriedkov. Možno budete mať problémy s\n"
-"inštaláciou Mageia Linux. Ak sa tak stane, skúste textovú inštaláciu. Pre "
-"jej\n"
-"spustenie stla�te `F1' po naštartovaní z CDROMky a zadajte `text'."
+"inštaláciou %s. Ak sa tak stane, skúste textovú inštaláciu. Pre jej\n"
+"spustenie stla�te `F1' po naštartovaní z CDROM a zadajte `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr ""
+msgid "Media Selection"
+msgstr "Výber zdroja"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr ""
+msgid "Install %s KDE Desktop"
+msgstr "Inštalovať %s KDE gafickú plochu"
+
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Inštalovať %s GNOME gafickú plochu"
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "Minimálna inštalácia"
+msgstr "Vlastná inštalácia"
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "Pracovná plocha IceWm"
+msgstr "KDE pracovná plocha"
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "Pracovná plocha IceWm"
+msgstr "GNOME pracovná plocha"
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "Pracovná plocha IceWm"
+msgstr "Vlastná pracovná plocha"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
-msgstr ""
+msgstr "Tu je náhľad pracovnej plochy  '%s' "
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
-msgstr ""
+msgstr "Kliknite na obrázky pre zvä�šenie"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Výber skupín balíkov"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Osobitná voľba balíkov"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Celková veľkosť: %d / %d MB"
+msgid "Unselect All"
+msgstr "Odzna�iť všetky"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Chybný balík"
+msgid "Total size: %d / %d MB"
+msgstr "Celková veľkosť: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Verzia:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Veľkosť:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Dôležitosť:"
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
-msgstr "Môžete ozna�iť/odzna�iť tento balík"
+msgid "You cannot select/unselect this package"
+msgstr "Nemôžete ozna�iť/odzna�iť tento balík"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "kôli chýbajúcemu %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "z dôvodu neuspokojenia %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokus o povýšenie %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
-msgstr "v prípade zachovania %s"
+msgstr "kvôli zachovaniu %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Nemôžete ozna�iť tento balík pretože na jeho inštaláciu nie je dosť miesta."
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Budú nainštalované nasledovné balíky"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Nasledujúce balíky budú odstránené"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Toto je jeden zo základných balíkov, nemôže byť odzna�ený"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Nemôžete odzna�iť tento balík. Je už nainštalovaný"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
-msgstr "Nemôžete odzna�iť tento balík. Musíte pridať novú verziu"
+msgid "You cannot unselect this package. It must be upgraded"
+msgstr "Nemôžete odzna�iť tento balík. Musí byť aktualizovaný"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Zobraziť automaticky zvolené balíky"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
-msgstr "Inštalácia"
+msgstr "Inštalovať"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Na�ítať/Uložiť výber "
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Aktualizácia výberu balíkov"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimálna inštalácia"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Správa softvéru"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Zvoľte balíky, ktoré si želáte nainštalovať"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Inštalujem"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Bez detailov"
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "Zvyšný �as "
+msgstr "Zostávajúci �as:"
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "Odhadujem"
+msgstr "(odhadujem...)"
 
-#: steps_gtk.pm:615
-#, fuzzy, c-format
+#: steps_gtk.pm:631
+#, c-format
 msgid "%d package"
 msgid_plural "%d packages"
-msgstr[0] "%d balíky"
-msgstr[1] "%d balíky"
-msgstr[2] "%d balíky"
+msgstr[0] "%d balíka"
+msgstr[1] "%d balíkov"
+msgstr[2] "%d balíkov"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Zhrnutie"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Konfigurovať"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "nenakonfigurované"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Výber skupín balíkov"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -953,84 +1144,84 @@ msgstr ""
 "Nasledovné inštala�né médiá boli nájdené.\n"
 "Ak nechcete niektoré z nich použiť, odzna�te ich teraz."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Máte možnosť skopírovať obsah CD na pevný disk pred inštaláciou.\n"
 "Potom bude inštalácia pokra�ovať z pevného disku a balíky budú dostupné aj "
 "po kompletnej inštalácii."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopírovať kompletné CD"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Vyskytla sa chyba"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
-msgstr "Prosím, zvoľte si typ vašej klávesnice"
+msgstr "Prosím, zvoľte si rozloženie klávesnice"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "Tu je úplný zoznam dostupných klávesníc"
+msgstr "Tu je kompletný zoznam dostupných klávesníc:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Inštalácia/Aktualizácia"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Želáte si vykonať inštaláciu alebo aktualizáciu?"
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Inštalácia"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Aktualizácia %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Kryptovací kľú� pre %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
-msgstr ""
+msgstr "Zrušiť inštaláciu, reštartovať systém"
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "Inštalujem"
+msgstr "Nová inštalácia"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
-msgstr ""
+msgstr "Aktualizovať predchádzajúcu inštaláciu (nedoporu�ené)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1038,38 +1229,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
+"Inštalátor zistil že váš nainštalovaný Linuxový systém nemôže\n"
+"byť bezpe�ne aktualizovaný na %s.\n"
+"\n"
+"Doporu�ujeme novú inštaláciu, ktorá nahradí predchádzajúcu.\n"
+"\n"
+"Upozornenie: mali by ste si zazálohovať vaše osobné dáta pred tým ako\n"
+" vyberiete \"Nová inštalácia\". "
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Konfigurácia IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Nie je dostatok miesta pre 1MB veľký bootstrap! Inštalácia môže pokra�ovať, "
-"ale pre spustenie systému musíte vytvoriť oddiel pomocou DiskDrake"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Je potrebné vytvoriť PPC PReP spúšťací bootstrap! Inštalácia bude "
-"pokra�ovať, ale pre spustenie systému musíte vytvoriť bootstrap oddiel "
-"pomocou DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1083,74 +1261,75 @@ msgstr ""
 "Ak takýto CD disk nemáte, zvoľte Zrušiť pre zrušenie inštalácie z tohoto CD-"
 "ROM disku."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Hľadajú sa dostupné balíky..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
+"Vo vašom systéme nie je dostatok voľného miesta pre inštaláciu alebo "
+"aktualizáciu (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"Vyberte si na�ítanie alebo uloženie výberu balíkov na disketu.\n"
-"Formát je rovnaký ako pre diskety generované automatickou\n"
-"inštaláciou."
+"Vyberte si na�ítanie alebo uloženie výberu balíkov.\n"
+"Formát je rovnaký ako pre súbory generované ako auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Zaťaženie"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Uložiť"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Zlý súbor"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "Výber skupín balíkov"
+msgstr "Výber pracovnej plochy"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
-msgstr ""
+msgstr "Môžete si vybrať váš profil pracovnej plochy."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Zvolená veľkosť je vä�šia ako dostupné miesto"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Typ inštalácie"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1159,88 +1338,115 @@ msgstr ""
 "Nebola vybraná žiadna skupina balíkov\n"
 "Prosím, zvoľte si typ minimálnej inštalácie, ktorú si želáte vykonať:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "S X Window System"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Inštaluje sa balík %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr "Inštalovať doporu�ené balíky"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "So základnou dokumentáciou (doporu�ené!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Naozaj minimálna inštalácia (bez urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Pripravuje sa aktualizácia..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Pripravuje sa inštalácia"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Inštaluje sa balík %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Chyba pri zora�ovaní zoznamu balíkov:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Napriek tomu pokra�ovať?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Opakovať"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
-msgstr ""
+msgstr "Presko�iť tento balík?"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
-msgstr ""
+msgstr "Presko�iť všetky balíky zo zdroja \"%s\""
 
-#: steps_interactive.pm:680
-#, fuzzy, c-format
+#: steps_interactive.pm:682
+#, c-format
 msgid "Go back to media and packages selection"
-msgstr "Uložiť výber balíkov"
+msgstr "Vrátiť sa naspäť na výber zdrojov a balíkov"
 
-#: steps_interactive.pm:683
-#, fuzzy, c-format
+#: steps_interactive.pm:685
+#, c-format
 msgid "There was an error installing package %s."
-msgstr "Po�as inštalácie balíkov sa vyskytla chyba:"
+msgstr "Vyskytla sa chyba po�as inštalácie balíka %s "
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Poinštala�ná konfigurácia"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
-msgstr ""
-"Presve�te sa prosím, že médium s aktualizovanými modulmi je v mechanike %s"
+msgstr "Presved�te sa prosím, že aktualiza�ný zdroj je v mechanike %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Aktualizácie"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Teraz máte možnosť nastaviť online zdroje."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Toto povolí nainštalovať bezpe�nostné aktualizácie."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Pre nastavenie tohoto zdroja budete potrebovať funk�né internetové \n"
+"pripojenie.\n"
+"\n"
+"Chcete nastaviť aktualiza�ný zdroj?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1261,28 +1467,29 @@ msgstr ""
 "\n"
 "Želáte si nainštalovať aktualizácie balí�kov?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardvér"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Zvuková karta"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Máte nejakú ISA zvukovú kartu?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1291,99 +1498,87 @@ msgstr ""
 "Po inštalácii spustite \"alsaconf\" alebo \"sndconfig\" ak chcete nastaviť "
 "zvukovú kartu"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Zvuková karta nebola nájdená. Skúste \"harddrake\" po inštalácii"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafické rozhranie"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Sieť a Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxy"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "nakonfigurované"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Úroveň bezpe�nosti"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktivované"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "zakázané"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Nemáte nakonfigurovaný X Window systém. Ste si istí, že to tak chcete?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Pripravuje sa zavádza�..."
+msgid "Preparing initial startup program..."
+msgstr "Pripravuje sa spúšťací program..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
-msgstr ""
+msgstr "Bu�te trpezlivý, môže to chvíľu trvať..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Zdá sa, že máte OldWorld alebo iný neznámy po�íta� a yaboot zavádza� vám "
-"nebude fungovať. Inštalácia bude pokra�ovať, ale budete potrebovať použiť "
-"BootX pre štartovanie vášho po�íta�a. Argument pre jadro s umiestnením "
-"koreňového súborového systému je: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
-"Vrámci tejto bezpe�nostnej úrovne je prístup k súborom na Windows oblasti "
+"V rámci tejto bezpe�nostnej úrovne je prístup k súborom na Windows oblasti "
 "umožnený iba pre administrátora."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Vložte �istú disketu do mechaniky %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Pripravuje sa autoinštala�ná disketa..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1394,12 +1589,12 @@ msgstr ""
 "\n"
 "Naozaj chcete teraz skon�iť?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulujeme"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Reštart"
@@ -1415,7 +1610,7 @@ msgstr "Jazyk"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "Lokalizácia"
 
 #: steps_list.pm:17
 #, c-format
@@ -1443,7 +1638,7 @@ msgstr "Detekcia pevného disku"
 msgid ""
 "_: Keep these entry short\n"
 "Installation class"
-msgstr ""
+msgstr "Inštala�ná trieda"
 
 #: steps_list.pm:23
 #, c-format
@@ -1471,14 +1666,14 @@ msgstr "Rozdelenie diskov"
 msgid ""
 "_: Keep these entry short\n"
 "Formatting"
-msgstr ""
+msgstr "Formátovanie"
 
 #: steps_list.pm:29
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Choosing packages"
-msgstr ""
+msgstr "Výber balíkov"
 
 #: steps_list.pm:31
 #, c-format
@@ -1494,13 +1689,6 @@ msgid ""
 "Users"
 msgstr "Používatelia"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Sieť"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1542,154 +1730,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Koniec"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Kancelárske programy: editory (kword, abiword), tabuľkové procesory "
-#~ "(kspread, gnumeric), pdf prehliada�e, at�"
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Sťahovanie súboru %s..."
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Zvolili ste nasledujúcu službu/služby: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Tieto služby sa spúšťajú implicitne. Momentálne nemajú žiadne známe "
-#~ "bezpe�nostné\n"
-#~ "problémy, ale v budúcnosti nejaké môžu byť nájdené. V tom prípade musíte "
-#~ "zabezpe�iť\n"
-#~ "upgrade �o najskôr.\n"
-#~ "\n"
-#~ "\n"
-#~ "Naozaj si želáte inštalovať tieto služby?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "Pracovná plocha IceWm"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr ""
-#~ "Pripájanie k zrkadliacemu serveru a získavanie zoznamu možných balíkov..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Nebolo možné spojiť sa so zrkadliacim serverom %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Príprava auto inštala�nej diskety"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "Automatická inštalácia môže byť plne automatizovaná\n"
-#~ "v tom prípade však inštalácia zaberie celý pevný disk.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Zopakovať"
-
-#~ msgid "Automated"
-#~ msgstr "Automatická"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Uložiť výber balíkov"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Chcete použiť aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Chyba inštalácie aboot.\n"
-#~ "Skúsiť silovú inštaláciu s možnosťou zni�enia prvého oddielu?"
-
-#~ msgid "All"
-#~ msgstr "VÅ¡etko"
-
-#~ msgid "TV card"
-#~ msgstr "TV karta"
-
-#~ msgid "Boot"
-#~ msgstr "Boot"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Autentifikácia"
-
-#~ msgid "Gwenview"
-#~ msgstr "Gwenview"
-
-#, fuzzy
-#~ msgid "Invictus Firewall"
-#~ msgstr "Interaktívny firewall"
-
-#, fuzzy
-#~ msgid "New Theme"
-#~ msgstr "Nová téma pre webmin"
-
-#~ msgid "DrakVPN"
-#~ msgstr "DrakVPN"
-
-#, fuzzy
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "%d balíky"
-#~ msgstr[1] "%d balíky"
-#~ msgstr[2] "%d balíky"
-
-#~ msgid "%d packages"
-#~ msgstr "%d balíky"
-
-#~ msgid "Language"
-#~ msgstr "Jazyk"
-
-#~ msgid "License"
-#~ msgstr "Licencia"
-
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "Voľba triedy inštalácie"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "Odhadujem"
-
-#, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "Výber balíkov"
-
-#~ msgid "Users"
-#~ msgstr "Používatelia"
-
-#~ msgid "Networking"
-#~ msgstr "Sieť"
-
-#~ msgid "Configure X"
-#~ msgstr "Konfigurácia X"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "Nie je možné na�ítať moduly pre vaše jadro (súbor %s chýba), toto sa "
-#~ "stáva hlavne vtedy, ak vaša disketa nie je vytvorená pre inštala�né "
-#~ "médium, ktoré používate (vytvorte si prosím novú štartovaciu disketu)"
diff --git a/perl-install/install/share/po/sl.po b/perl-install/install/share/po/sl.po
index 97bff6650..dcaf99ca9 100644
--- a/perl-install/install/share/po/sl.po
+++ b/perl-install/install/share/po/sl.po
@@ -1,4 +1,3 @@
-# translation of sl.po to Slovenian
 # Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # Matjaž Kaše <matjaz.kase@g-kabel.si>, 2004.
@@ -6,54 +5,81 @@
 # Gregor Pirnaver <gregor.pirnaver@sdm-si.org>, 2002,2004,2005.
 # Jure Repinc <jlp@holodeck1.com>, 2005, 2007, 2008, 2009.
 # Matjaž Kaše <matjaz.kase@telemach.net>, 2006.
+# Filip Komar <filip.komar@gmail.com>, 2011 - 2015.
+# Rok Kepa <rokkepa@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: sl\n"
+"Project-Id-Version: drakx_install\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-10-03 16:38+0200\n"
-"Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
-"Language-Team: Slovenian <lugos-slo@lugos.si>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 19:56+0200\n"
+"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
+"Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
+"i18n@mageia.org>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
-"n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3)\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Vaše namizje na USB klju�ku"
+msgid "Join Us!"
+msgstr "Pridružite se nam!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "100 %% odprto-kodna distribucija Mageia Linux"
+msgid "Make it yours!"
+msgstr "Osvojite jo!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Z Mageia One je odkrivanje Linuxa preprosto"
+msgid "Your choice!"
+msgstr "Vaša izbira!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Popolno namizje Mageia Linux, s podporo"
+msgid "Office tools"
+msgstr "Pisarniška orodja"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: distribucije za potrebe vsakogar"
+msgid "Home entertainment"
+msgstr "Doma�a zabava"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Za otroke"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Za družino!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Za razvijalce!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Hvala!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Bodite svobodni!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Ali imate Å¡e kak dodaten namestitveni vir?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -61,98 +87,96 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
-"Zaznani so bili slede�i viri, ki bodo uporabljeni med namestitvijo: %s.\n"
+"Zaznani so bili naslednji viri, ki bodo uporabljeni med namestitvijo: %s.\n"
 "\n"
 "\n"
-"Ali imate Å¡e kak dodaten vir, ki ga je potrebno nastaviti?"
+"Ali imate Å¡e kak dodaten namestitveni vir, ki ga je potrebno nastaviti?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Omrežje (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Omrežje (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Omrežje (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Lokacija zrcalnega strežnika?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Lokacija se mora za�eti z ftp:// ali s http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Vzpostavljanje povezave s spletno stranjo Mageia Linux in pridobivanje "
-"seznama dosegljivih zrcalnih strežnikov ..."
+"Vzpostavljanje povezave s spletno stranjo %s in pridobivanje seznama "
+"dosegljivih zrcalnih strežnikov ..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Vzpostavljanje povezave s spletno stranjo Mageia Linux in pridobivanje "
-"seznama dosegljivih zrcalnih strežnikov nista uspela"
+"Vzpostavljanje povezave s spletno stranjo %s in pridobivanje seznama "
+"dosegljivih zrcalnih strežnikov ni uspelo"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Izberite zrcalni strežnik, s katerega želite pridobiti pakete"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Namestitev prek NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Vnesite ime gostitelja in ime mape vašega vira NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Manjka ime gostitelja"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Mapa se mora pri�eti z »/«"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Ime gostitelja vira NFS"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Mapa"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Dodatno"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -161,23 +185,98 @@ msgstr ""
 "Na tem zrcalnem strežniku ne najdem seznama paketov. Prepri�ajte se, da je "
 "lokacija prava."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Glavni (core) - izdajni"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Patentno zaš�iteni (tainted) - izdajni"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Lastniški (nonfree) - izdajni"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Nekateri deli vaše strojne opreme za pravilno delovanje odprtokodnih "
+"gonilnikov potrebujejo lastniško strojno programsko opremo."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Priporo�ljivo je omogo�iti vir »%s«"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+"Vir »%s« vsebuje razli�ne sistemske dele in pripadajo�o programsko opremo"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "Vir »%s« vsebuje lastniško programsko opremo.\n"
+
+#: any.pm:477
+#, 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 ""
+"Vsebuje tudi strojno programsko opremo, ki je potrebna za delovanje "
+"nekaterih naprav (npr.: nekatere grafi�ne kartice ATI/AMD, dolo�ene mrežne "
+"kartice, nekatere kartice RAID) ..."
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"Vir »%s« vsebuje programsko opremo, ki je zaradi patentne zaš�ite v "
+"nekaterih državah ni možno prosto razširjati."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "Vsebuje tudi pakete iz vira »%s«, a z dodatnimi zmožnostmi."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Tu lahko po želji omogo�ite ve� virov."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Ta vir ponuja posodobitve paketov za vir »%s«"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Pregledovanje že nameš�enih paketov ..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Iskanje paketov za posodobitev ..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Odstranjevanje paketov pred posodobitvijo ..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -191,87 +290,87 @@ msgstr ""
 "\n"
 "Ali naj odstranim navedene pakete?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Napaka pri branju datoteke %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "Naslednji diski so bili preimenovani:"
+msgstr "Preimenovani so bili naslednji diski:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (prejšnje ime: %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Omrežje"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Izberite vir"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Datoteka že obstaja. Ali naj jo nadomestim?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Napa�no ime NFS"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Neustrezen vir %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Posnetkov zaslona ni mogo�e zajeti, dokler disk ni razdeljen"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "Posnetki zaslona bodo po namestitvi v %s"
+msgstr "Po namestitvi bodo posnetki zaslona v %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Namestitev"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Nastavitev"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Formatirati morate tudi %s"
@@ -289,29 +388,29 @@ msgstr ""
 #: interactive.pm:22
 #, c-format
 msgid "Bringing up the network"
-msgstr "Vklapljanje omrežja"
+msgstr "Priklapljanje omrežja"
 
 #: interactive.pm:27
 #, c-format
 msgid "Bringing down the network"
 msgstr "Izklapljanje omrežja"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
-msgstr "Prosimo, po�akajte. Pridobivanje datoteke ..."
+msgstr "Po�akajte. Pridobivanje datoteke ..."
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr "ni mo� dodati vira"
+msgstr "dodajanje vira ni bilo možno"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiranje nekaterih paketov na disk, za kasnejšo uporabo"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiranje poteka"
@@ -341,75 +440,100 @@ msgstr "uporabno"
 msgid "maybe"
 msgstr "morda"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Pridobivanje informacij o paketu iz metapodatkov XML ..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr "Za vir »%s« ni metapodatkov, zato rezultati za paket %s niso popolni"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Brez opisa"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
-"Ni mo� namestiti nekaj paketov, ki jih zahteva %s:\n"
+"Nekaj paketov, ki jih zahteva %s ni mogo�e namestiti:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Prišlo je do napake:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Zgodila se je usodna napaka: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Ne sprašuj ve�"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
-msgstr "%d namestitvenih transakcij je spodletelo"
+msgstr "Spodletelo je %d namestitvenih transakcij"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Nameš�anje paketov ni uspelo:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Delovna postaja"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Pisarniška delovna postaja"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Pisarniški programi: urejanje besedila (OpenOffice.org Writer, KWord), "
-"preglednice (OpenOffice.org Calc, KSpread), pregledovalniki PDF, itd"
+"Pisarniški programi: urejavalniki besedil (LibreOffice Writer, KWord), "
+"preglednice (LibreOffice Calc, KSpread), pregledovalniki PDF, itd"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Igralna postaja"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programi za zabavo: arkade, deske, strategije, itd"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Ve�predstavnostna postaja"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programi za predvajanje in urejanje zvoka in videa"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internetna postaja"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -418,193 +542,193 @@ msgstr ""
 "Zbirka orodij za branje in pošiljanje pošte in pošiljanje v novi�arske "
 "skupine (mutt, tin ...) ter brskanje po spletu"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Omrežni ra�unalnik (odjemalec)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Odjemalci za razli�ne protokole, vklju�ujo� SSH"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Orodja za lažjo nastavitev ra�unalnika"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konzolna orodja"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Urejevalniki, lupine, datote�na orodja, terminali"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Razvoj"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Razvojne knjižnice, programi in datoteke z glavami za C in C++"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Knjige in priro�niki o Linuxu in prostem programju"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Standardna osnova Linuxa (LSB). Podpora programom tretjih oseb"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Spletni strežnik"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Skupinsko delo"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Strežnik Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Požarni zid/usmerjevalnik"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internetni prehod (gateway)"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Pošta/novi�arske skupine"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Poštni strežnik postfix in novi�arski strežnik Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Imeniški strežnik"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Strežnik FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Strežnik imen domen in omrežnih podatkov"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Strežnik za souporabo datotek in tiskalnikov"
+msgstr "Strežnik za skupno rabo datotek in tiskalnikov"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Strežnik NFS, strežnik Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Podatkovna zbirka"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Strežnik podatkovnih baz PostgreSQL in MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Strežnik podatkovnih baz PostgreSQL in MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Splet/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Pošta"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Poštni strežnik Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Strežnik podatkovnih baz PostgreSQL ali MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Strežnik podatkovnih baz PostgreSQL ali MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Omrežni ra�unalnik (strežnik)"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Strežnik NFS, strežnik SMB, posredniški strežnik, strežnik SSH"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafi�no okolje"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Delovna postaja KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -612,77 +736,136 @@ msgid ""
 msgstr ""
 "Namizno okolje KDE, moderno grafi�no okolje z zbirko pripadajo�ih orodij"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Delovna postaja GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
-msgstr "Grafi�no okolje z naborom programov in namiznimi orodji"
+msgstr ""
+"Grafi�no okolje z naborom uporabniku prijaznih programov in namiznimi orodji"
+
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Delovna postaja XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Majhno grafi�no okolje z naborom uporabniku prijaznih programov in namiznimi "
+"orodji"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Delovna postaja MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Delovna postaja Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Grafi�no okolje osnovano na GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Namizje LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Nova generacija majhnega in hitrega namiznega okolja prenesenega na QT"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Namizje Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Majhno in hitro grafi�no okolje s predanimi privrženci"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Namizje LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Majhno in hitro grafi�no okolje"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Namizje Plazma"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr ""
-"Majhno in hitro grafi�no okolje z naborom programov in namiznimi orodji"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "Namizje Plazma, osnovno grafi�no okolje z zbirko pripadajo�ih orodij"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Druga grafi�na namizja"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, FVWM ..."
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, FVWM ..."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Pripomo�ki"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Strežnik SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Strežnik Webmin za oddaljeno nastavljanje"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Omrežni pripomo�ki/nadzorovanje"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Nadzorna orodja, knjigovodstvo procesov, tcpdump, nmap ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
-msgstr "Mandrivini �arovniki"
+msgstr "Magejini �arovniki"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Čarovniki za nastavitev strežnikov"
@@ -696,7 +879,7 @@ msgstr ""
 "Prišlo je do napake, ki je sistem ne zna odpraviti na ustrezen na�in.\n"
 "Nadaljujte na lastno odgovornost."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -716,226 +899,231 @@ msgstr "Pri�etek koraka »%s«\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Namestitev Mageia Linuxa %s"
+msgid "%s Installation %s"
+msgstr "Namestitev %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> med elementi"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
-msgstr "Grafi�ni strežnik se zaganja po�asi. Prosimo, po�akajte ..."
+msgstr "Grafi�ni strežnik se zaganja po�asi. Po�akajte ..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vaš sistem ni zelo zmogljiv. Lahko, da boste imeli pri namestitvi\n"
-"Mageia Linuxa težave. V tem primeru lahko poskusite z namestitvijo\n"
+"%s težave. V tem primeru lahko poskusite z namestitvijo\n"
 "v besedilnem na�inu.\n"
 "Po zagonu z namestitvenega nosilca pritisnite »F1« in vnesite »text«."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Namizje KDE"
+msgid "Media Selection"
+msgstr "Izbira virov"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Namizje GNOME"
+msgid "Install %s KDE Desktop"
+msgstr "Namestitev %s namizja KDE"
+
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Namestitev %s namizja GNOME"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Po meri"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Namizje KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Namizje GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Namizje po meri"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "To je ogled namizja »%s«."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
-msgstr "Kliknite na sliko, da vidite ve�ji ogled"
+msgstr "Kliknite na sliko, da vidite ve�ji predogled"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Izbira skupin paketov"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Izbira posami�nih paketov"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Skupna velikost: %d / %d MiB"
+msgid "Unselect All"
+msgstr "Odstrani izbiro"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Paket je poškodovan"
+msgid "Total size: %d / %d MB"
+msgstr "Skupna velikost: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Razli�ica: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Velikost: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
-msgstr "%d KiB\n"
+msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Pomembnost: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Tega paketa ne morete izbrati ali izlo�iti."
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "ker manjka %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zaradi ne-zadostitve %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "poizkušam uveljaviti %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "da bi obdržal %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Tega paketa ne morete izbrati, ker ni dovolj prostora, da bi ga lahko "
 "namestili."
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Nameš�eni bodo naslednji paketi"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Odstranjeni bodo naslednji paketi"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "To je obvezen paket in ga ni mogo�e izlo�iti."
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Tega paketa ne morete izlo�iti, ker je že nameš�en."
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Tega paketa ne morete izlo�iti, ker ga je treba posodobiti."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Prikaži samodejno izbrane pakete"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Namesti"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Naloži/shrani izbor"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Posodabljanje izbora paketov"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimalna namestitev"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Upravljanje s programi"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Izberite pakete, ki jih želite namestiti"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Nameš�anje"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Brez podrobnosti"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Preostali �as:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(izra�unavanje ...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
@@ -944,41 +1132,36 @@ msgstr[1] "%d paketa"
 msgstr[2] "%d paketi"
 msgstr[3] "%d paketov"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Povzetek"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Nastavitev"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "ni nastavljeno"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Izbira virov"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 "Na voljo so naslednji viri za namestitev.\n"
-"Če želite katerega izmed njih izlo�iti, to lahko storite sedaj."
+"Če želite, lahko katerega izmed njih sedaj izlo�ite."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Pred namestitvijo lahko vsebino namestitvenih nosilcev prekopirate na trdi "
@@ -986,72 +1169,72 @@ msgstr ""
 "V tem primeru bo namestitev potekala s trdega diska, paketi pa bodo ostali "
 "na voljo tudi po zaklju�eni namestitvi."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Prekopiraj vsebino nosilcev"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Prišlo je do napake"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Izberite razpored tipkovnice"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Tu je celoten seznam razpoložljivih tipkovnic:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Namestitev/nadgradnja"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Ali želite izvesti namestitev ali nadgradnjo?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Namestitev"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Nadgradnja %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Šifrirni klju� za %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Prekli�i namestitev, znova zaženi ra�unalnik"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Nova namestitev"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Nadgradite obstoje�o namestitev (ni priporo�eno)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1059,46 +1242,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Namestitveni program je zaznal, da obstoje�e namestitve Mageia\n"
-"Linuxa ni mo� varno nadgraditi na razli�ico %s.\n"
+"Namestitveni program je zaznal, da obstoje�e namestitve\n"
+"Linuxa ni mogo�e varno nadgraditi na razli�ico %s.\n"
 "\n"
 "Priporo�ena je nova namestitev, ki nadomesti obstoje�o.\n"
 "\n"
 "Opozorilo: Pred nadaljevanjem z novo namestitvijo napravite\n"
 "varnostno kopijo vseh osebnih podatkov."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Nastavljanje IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Ni prostora za zapis za�etnega nalagalnika (1 MiB). Namestitev se bo "
-"nadaljevala, vendar morate, da bi sistem po namestitvi lahko zagnali, s "
-"pomo�jo orodja DiskDrake ustvariti razdelek za za�etno nalaganje."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Ustvariti morate za�etni nalagalnik PPC PReP Boot! Namestitev se bo "
-"nadaljevala, vendar boste morali za zagon sistema s pomo�jo DiskDrake "
-"ustvariti razdelek za za�etno nalaganje."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1108,78 +1270,78 @@ msgid ""
 msgstr ""
 "Zamenjajte nosilec!\n"
 "\n"
-"V pogon vstavite namestitveni nosilec z oznako »%s« in kliknite V redu\n"
+"V pogon vstavite namestitveni nosilec z oznako »%s« in kliknite V redu.\n"
 "Če zahtevanega nosilca nimate, kliknite Prekli�i, da ga bo namestitev "
 "presko�ila."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Iskanje razpoložljivih paketov ..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
-"Sistem nima dovolj prostora za namestitev ali nadgradnjo (%d MiB > %d MiB)"
+"Sistem nima dovolj prostora za namestitev ali nadgradnjo (%d MB > %d MB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 "Izberite nalaganje ali shranjevanje izbora paketov.\n"
-"Format je enak formatu datotek za samodejno namestitev."
+"Format je enak formatu datotek za samodejno namestitev (auto_install)."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Naloži"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Shrani"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Neustrezna datoteka"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Izbira namizja"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Tu lahko izberete namizno okolje, ki bo nameš�eno."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Velikost izbora presega velikost razpoložljivega prostora."
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Vrsta namestitve"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1188,87 +1350,114 @@ msgstr ""
 "Izbrali niste nobene skupine paketov.\n"
 "Izbrati morate vsaj minimalno namestitev:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Z grafi�nim okoljem"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Namesti predlagane pakete"
+msgid "Install recommended packages"
+msgstr "Namesti priporo�ene pakete"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Z osnovno dokumentacijo (priporo�eno)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Zares najmanjša možna namestitev (še posebej brez urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Pripravljanje nadgradnje ..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Pripravljanje namestitve"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Nameš�anje paketa %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Med razvrš�anjem paketov je prišlo do napake:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Ali naj kljub temu nadaljujem?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Poskusi znova"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Spusti ta paket"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Spusti vse pakete z nosilca »%s«"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Nazaj na izbiro nosilcev in paketov"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Prišlo je do napake med nameš�anjem paketa %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Nastavitev po namestitvi"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Prepri�ajte se, da je nosilec »Posodobitev modulov« v pogonu %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Posodobitve"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Sedaj je priložnost za nastavitev spletnih virov."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "S tem bo možno namestiti varnostne posodobitve."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Za nastavitev spletnih virov je potrebna delujo�a spletna povezava.\n"
+"\n"
+"Ali želite nastaviti spletne posodobitvene vire?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1280,36 +1469,37 @@ msgid ""
 "\n"
 "Do you want to install the updates?"
 msgstr ""
-"Imate možnost, da s strežnika prenesete posodobljene pakete. Ti paketi\n"
-"so bili posodobljeni po izdaji distribucije. Vsebujejo varnostne popravke in "
-"popravke napak.\n"
+"Zdaj imate možnost, da s strežnika prenesete posodobljene pakete.\n"
+"Ti paketi so bili posodobljeni po izdaji distribucije. Zelo verjetno "
+"vsebujejo varnostne popravke in popravke napak.\n"
 "\n"
 "Za namestitev teh paketov morate imeti vzpostavljeno internetno povezavo.\n"
 "\n"
 "Ali želite namestiti posodobitve?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Strojna oprema"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Zvo�na kartica"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Ali imate zvo�no kartico na vodilu ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1318,82 +1508,70 @@ msgstr ""
 "Za nastavitev zvo�ne kartice po namestitvi zaženite »alsaconf« ali "
 "»sndconfig«."
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Ne zaznam zvo�ne kartice. Po namestitvi jo poskusite nastaviti s pomo�jo "
 "»harddrake«."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafi�na kartica"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Omrežje in internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Posredniški strežniki"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "nastavljeno"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Stopnja varnosti"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Požarni zid"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktivirano"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "onemogo�eno"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
-msgstr "Niste nastavili grafi�nega strežnika. Ali to zares želite?"
+msgstr "Grafi�nega strežnika niste nastavili. Ali to zares želite?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Pripravljanje zagonskega nalagalnika ..."
+msgid "Preparing initial startup program..."
+msgstr "Pripravljanje za�etnega zagonskega programa ..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
-msgstr "Prosimo, potrpite. To lahko traja dalj �asa ..."
+msgstr "Potrpite. To lahko traja dalj �asa ..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Na vašem ra�unalniku zagonski nalagalnik yaboot ne bo deloval.\n"
-"Namestitev se bo nadaljevala, vendar boste morali\n"
-"ra�unalnik zagnati s pomo�jo BootX ali na drug na�in. Nastavitev jedra za "
-"korenski datote�ni sistem je: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1402,17 +1580,17 @@ msgstr ""
 "Na tej varnostni stopnji je dostop do datotek na razdelku za Windows "
 "dovoljen samo skrbniku sistema (root)."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "V pogon %s vstavite prazno disketo"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Ustvarjanje diskete za samodejno namestitev ..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1423,12 +1601,12 @@ msgstr ""
 "\n"
 "Ali res želite kon�ati?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "ÄŒestitke"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Ponovni zagon"
@@ -1465,7 +1643,7 @@ msgstr "Miška"
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
-msgstr "Zaznava trdega diska"
+msgstr "Zaznava trdih diskov"
 
 #: steps_list.pm:21 steps_list.pm:22
 #, c-format
@@ -1523,13 +1701,6 @@ msgid ""
 "Users"
 msgstr "Uporabniki"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Omrežje"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1572,115 +1743,78 @@ msgid ""
 "Exit"
 msgstr "Izhod"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Pripravljanje zagonskega nalagalnika ..."
+
 #~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
 #~ msgstr ""
-#~ "Pisarniški programi: urejanje besedila (KWord, AbiWord), preglednice "
-#~ "(KSpread, Gnumeric), pregledovalniki PDF, itd"
+#~ "Majhno in hitro grafi�no okolje z naborom uporabniku prijaznih programov "
+#~ "in namiznimi orodji"
+
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Namizje RazorQT"
 
 #~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
 #~ msgstr ""
-#~ "Izbrali ste posodobitev sistema na %s. Na sistemu je bil zaznan KDE 3.5.\n"
-#~ "Program za nameš�anje pri posodobitvi ne more ohraniti KDE 3.5. Če "
-#~ "nadaljujete,\n"
-#~ "bo KDE 3.5 nadomeš�en s KDE 4, pri tem pa bodo izgubljene vse osebne "
-#~ "nastavitve\n"
-#~ "za KDE. Da bi posodobili sistem ter ohranili KDE 3.5 in nastavitve zanj, "
-#~ "znova \n"
-#~ "zaženite ra�unalnik in opravite posodobitev z uporabo program�ka Mandriva "
-#~ "Update."
+#~ "Ni prostora za zapis za�etnega nalagalnika (1 MB). Namestitev se bo "
+#~ "nadaljevala, vendar morate, da bi sistem po namestitvi lahko zagnali, s "
+#~ "pomo�jo orodja DiskDrake ustvariti razdelek za za�etno nalaganje."
 
-#~ msgid "Proceed"
-#~ msgstr "Nadaljuj"
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "Ustvariti morate za�etni nalagalnik PPC PReP Boot! Namestitev se bo "
+#~ "nadaljevala, vendar morate, da bi sistem po namestitvi lahko zagnali, s "
+#~ "pomo�jo orodja DiskDrake ustvariti razdelek za za�etno nalaganje."
 
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "pridobivanje [%s] ni uspelo"
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Na vašem ra�unalniku zagonski nalagalnik yaboot ne bo deloval.\n"
+#~ "Namestitev se bo nadaljevala, vendar boste morali\n"
+#~ "ra�unalnik zagnati s pomo�jo BootX ali na kak drug na�in. Nastavitev "
+#~ "jedra za korenski datote�ni sistem je: root=%s"
 
-#~ msgid "Downloading file %s..."
-#~ msgstr "Prenos datoteke %s ..."
+#~ msgid "Welcome"
+#~ msgstr "Dobrodošli"
 
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr "Posodobitev z 32-bitnega na 64-bitni sistem ni podprta"
+#~ msgid "People!"
+#~ msgstr "Ljudje"
 
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr "Posodobitev s 64-bitnega na 32-bitni sistem ni podprta"
+#~ msgid "For people"
+#~ msgstr "Za ljudi"
 
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Izbrali ste naslednje strežnike: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Navedeni strežniki se zaženejo samodejno. Trenutno nimajo nobenih znanih\n"
-#~ "varnostnih težav, a lahko odkrijejo nove. V tem primeru je strežnike "
-#~ "potrebno\n"
-#~ "�im prej posodobiti.\n"
-#~ "\n"
-#~ "\n"
-#~ "Ali ste prepri�ani, da želite namestiti navedene strežnike?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "Namizje IceWM"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr ""
-#~ "Vzpostavljanje povezave z zrcalnim strežnikom in pridobivanje seznama "
-#~ "dosegljivih paketov...."
+#~ msgid "For contributors"
+#~ msgstr "Za vse, ki prispevajo"
 
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Povezave z zrcalnim strežnikom %s ni mogo�e vzpostaviti."
+#~ msgid "For you"
+#~ msgstr "Za vsakogar"
 
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Ustvari disketo za samodejno namestitev"
+#~ msgid "Welcome!"
+#~ msgstr "Dobrodošli"
 
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "Namestitev je lahko povsem samodejna, V tem\n"
-#~ "primeru se uporabi ves trdi disk!!\n"
-#~ "(Takšen na�in je uporaben, �e želite namestitev\n"
-#~ "zagnati na drugem ra�unalniku.)\n"
-#~ "\n"
-#~ "Morda vam bolj ustreza ponovitev namestitve.\n"
+#~ msgid "Select All"
+#~ msgstr "Izberi vse"
 
-#~ msgid "Replay"
-#~ msgstr "Ponovi"
+#~ msgid "Bad package"
+#~ msgstr "Paket je poškodovan"
 
-#~ msgid "Automated"
-#~ msgstr "Samodejno"
+#~ msgid "Preparing boot images..."
+#~ msgstr "Pripravljanje zagonskega nalagalnika ..."
 
-#~ msgid "Save packages selection"
-#~ msgstr "Shrani izbiro paketov"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Ali želite uporabiti aboot?"
+#~ msgid "Mageia, the new Linux distribution"
+#~ msgstr "Mageia, nova distribucija Linuxa"
 
 #~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Napaka pri namestitvi aboot\n"
-#~ "Ali želite nadaljevati z namestitvijo, �eprav bo s tem prvi razdelek "
-#~ "uni�en?"
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Omrežje"
diff --git a/perl-install/install/share/po/sq.po b/perl-install/install/share/po/sq.po
index ca2f95e08..e1813981e 100644
--- a/perl-install/install/share/po/sq.po
+++ b/perl-install/install/share/po/sq.po
@@ -1,54 +1,82 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# Naim Daka <naim70@freesurf.ch>, 2002, 2003.
-#
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Ardit Dani <ardit.dani@gmail.com>, 2014-2015
+# Naim Daka <naim70@freesurf.ch>, 2002-2003
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX for MDK 9.2\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2004-09-15 13:33+0200\n"
-"Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
-"Language-Team: Albanian <LL@li.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-06-10 17:51+0000\n"
+"Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
+"Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/"
+"language/sq/)\n"
 "Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
+msgid "Join Us!"
+msgstr "Bashkohu me ne!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr ""
+msgid "Make it yours!"
+msgstr "Bëni atë tuajat!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr ""
+msgid "Your choice!"
+msgstr "Zgjedhja juaj!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr ""
+msgid "Office tools"
+msgstr "Vegla zyre"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr ""
+msgid "Home entertainment"
+msgstr "Argëtim shtëpie "
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Për fëmijët"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Për familjen!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Për zhvilluesit!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Faleminderit!"
 
-#: any.pm:109
-#, fuzzy, c-format
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Ekzisto Lirshëm!"
+
+#: any.pm:151
+#, c-format
 msgid "Do you have further supplementary media?"
-msgstr "A posedoni ndonjë tjetër?"
+msgstr "A keni media të mëtejshme shtesë?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -56,115 +84,192 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
+"Mediat e mëposhtme janë gjetur dhe do të përdoret gjatë instalimit: %s\n"
+"\n"
+"\n"
+"A keni një media shtesë instalimi për konfigurimin?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
-#, fuzzy, c-format
+#: any.pm:163
+#, c-format
 msgid "Network (HTTP)"
-msgstr "Rrjeti %s"
+msgstr "Rrjeti (HTTP)"
 
-#: any.pm:122
-#, fuzzy, c-format
+#: any.pm:164
+#, c-format
 msgid "Network (FTP)"
-msgstr "Rrjeti %s"
+msgstr "Rrjeti (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
-msgstr ""
+msgstr "Rrjeti (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
-msgstr ""
+msgstr "URL e pasqyrës?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
-msgstr ""
+msgstr "URL duhet të filloj me http:// ose https://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Lidhje në sitin Mageia Linux për të pranuar listën e lirë të pasqyreve..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Lidhje në sitin %s për të pranuar listën e lirë të pasqyreve..."
 
-#: any.pm:187
-#, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+#: any.pm:253
+#, c-format
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Lidhje në sitin Mageia Linux për të pranuar listën e lirë të pasqyreve..."
+"Dështoi kontaktuari %s faqen për të marrë listën e pasqyrave në dispozicion"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Zgjedheni një pasqyre nga e cila do ti transferoni pakot"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
-msgstr ""
+msgstr "Ndërtimi NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
-msgstr ""
+msgstr "Ju lutemi shkruani pritësin dhe skedarin tuaj të medias NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
-msgstr ""
+msgstr "Pritësi mungon"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
-msgstr ""
+msgstr "Skedari duhet të fillojë me \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
-msgstr ""
+msgstr "Pritësi i montuesit NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Repertori"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
-msgstr ""
+msgstr "Plotësues"
 
-#: any.pm:295
-#, fuzzy, c-format
+#: any.pm:369
+#, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
-msgstr "Nuk mund ta gjejë %s në %s"
+msgstr ""
+"Nuk mund të gjeni një dokument listë pakete në këtë pasqyrë. Sigurohuni "
+"vendi është e saktë."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Lëshim Bërthamë"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Lëshim Prishur"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Lëshim Jofalas"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Disa pajisje-elektronikenë kompjuterin tuaj ka nevojë për disa udhzues jo të "
+"lirë në mënyrë që drejtuesit e programevetë lirë të punojnë."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Ju duhet të mundësoni \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" përmban pjesë të ndryshme të sistemet dhe aplikimet e saj"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" përmban programe jo të lirë.\n"
+
+#: any.pm:477
+#, 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 ""
+"Ai gjithashtu përmban një program nevojshme për pajisje të caktuara për të "
+"vepruar (p.sh: disa karta grafike ATI/AMD, disa kartat e rrjetit, disa karta "
+"RAID, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" përmban programe që nuk mund të shpërndahet në çdo vend për shkak të "
+"patentave të programit."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "Ai gjithashtu përmban program nga \"%s\" rindërtuar me aftësi shtesë."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Këtu ju mund të mundësoni më shumë media në qoftë se ju dëshironi."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Ky medium ofron përditësime paketë për të mesëm \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Kërkimi i pakove veqse të instaluara..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Gjetja pakove azhurnuese..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
-msgstr ""
+msgstr "Heqja paketave para përmirësimit..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -177,88 +282,88 @@ msgstr ""
 "\n"
 "Me të vërtetë dëshironi ti zhdukni?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Gabim gjatë leximit të skedares %s"
 
-#: any.pm:1020
-#, fuzzy, c-format
+#: any.pm:1304
+#, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "Pakot e radhitura duhet të instalohen:\n"
+msgstr "Di(s)qet mëposhtme janë riemëruar:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
-msgstr ""
+msgstr "%s (të emëruar më parë si %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rrjeti"
 
-#: any.pm:1102
-#, fuzzy, c-format
+#: any.pm:1386
+#, c-format
 msgid "Please choose a media"
-msgstr "Ju lutemi zgjedheni"
+msgstr "Ju lutemi zgjidhni një media"
 
-#: any.pm:1118
-#, fuzzy, c-format
+#: any.pm:1402
+#, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "Skedarje është veqse prezente. Përdoreni atë?"
+msgstr "Skedari ekziston. Mbishkruaj atë?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Autorizim i pa pranuar"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
-msgstr ""
+msgstr "Emër keq NFS"
 
-#: any.pm:1191
-#, fuzzy, c-format
+#: any.pm:1475
+#, c-format
 msgid "Bad media %s"
-msgstr "shtuarja e burimit %s"
+msgstr "Media keqe %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "E pa mundur grabitja e ekranit (screenshots) para ndarjeve"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 "Grabitjet e ekranit (screenshots) janë të mundura mbas instalimit në %s"
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
 msgstr "Instalimi"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfigurimi"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Ju duhet njashtu ta formatoni %s"
@@ -283,25 +388,25 @@ msgstr "Nisja e rrjetit (network)"
 msgid "Bringing down the network"
 msgstr "Ndalja e rrjetit (network)"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
-msgstr ""
+msgstr "Ju lutem prisni, rikthim i skedarit"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
-msgstr ""
+msgstr "e pamundur shtimi medies"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
-msgstr ""
+msgstr "Kopjimi disa paketa në disqe për përdorim në të ardhmen"
 
-#: media.pm:810
-#, fuzzy, c-format
+#: media.pm:805
+#, c-format
 msgid "Copying in progress"
-msgstr "Zbulimi në vazhdim e sipër"
+msgstr "Kopjimi në progres"
 
 #: pkgs.pm:32
 #, c-format
@@ -328,268 +433,297 @@ msgstr "i mirë"
 msgid "maybe"
 msgstr "ndoshta"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Marrja informacionit paketës nga XML meta-data..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Nuk ka informacion xml për medien \"%s\", vetëm rezultati i pjesshëm për "
+"paketën %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Asnjë përshkrim"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
+"Disa paketa të kërkuara nga %s nuk mund të instalohen:\n"
+"%s"
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "Një gabim është paraqitur"
+msgstr "Një gabim ndodhi:"
+
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Një gabim fatal është paraqitur: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Mos pyesni përsëri"
 
-#: pkgs.pm:814
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "Instalimi i transmetimit të %d dështio"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "Instalimi i pakove %s"
+msgstr "Instalimi i paketave dështoj:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Stacion punues"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Stacioni Punues në Tryezë"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programe për tryezë: trajtues të teksteve (OpenOffice.org Writer, Kword), "
-"tablues (OpenOffice.org Calc, Kspread), çfaqës pdf, etj."
+"Programe për tryezë: trajtues të teksteve (LibreOffice Writer, Kword), "
+"tablues (LibreOffice Calc, Kspread), çfaqës pdf, etj."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Stacion Lojërash"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programe ahengi: lojë arkade, lojë me stenda, strategji, etj"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Stacion Multimedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programe për lojëra/botime të zërit dhe videos"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Stacion Interneti"
 
-#: share/meta-task/compssUsers.pl:33
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:37
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
-"Përgjithësia a veglave të leximit, dërgimit të letrave elektronike të "
-"lajmeve (pine, mutt, tin...) dhe për të lundruar në internet."
+"Set mjetesh për të lexuar dhe për të dërguar postë dhe lajme (mutt, tin ..) "
+"dhe të shfletoni Internetin"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Kompjuter Rrjeti (klient)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klient për protokole të ndryshme me përfshirje në ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Vegla për të konfiguruar kompjuterin tuaj"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Vegla në konsolë"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Botues, interpretues, vegla skedaresh, terminale"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Zhvillimi"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Bibloteka ndërtuese e C dhe C++, programe dhe skedare me përfshirje"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentacioni"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Libra dhe Howto's për Linux dhe Softver gratis"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Bazë Standarde e Linux. Përkrahë aplikacione të pjesës së tretë"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Server Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:84
+#, c-format
 msgid "Groupware"
-msgstr "Grupi"
+msgstr "Grupimi"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Server Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Murë-i-Zjarrtë/Router"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Portë kaluese Interneti"
 
-#: share/meta-task/compssUsers.pl:84
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:92
+#, c-format
 msgid "Mail/News"
-msgstr "/Skedare/_E Re"
+msgstr "Postë/Lajme"
 
-#: share/meta-task/compssUsers.pl:85
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:93
+#, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Server i letrave (mail) Postfix"
+msgstr "Postfix server poste,  Inn server lajme"
 
-#: share/meta-task/compssUsers.pl:88
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:97
+#, c-format
 msgid "Directory Server"
-msgstr "Riparoje Nga CD"
+msgstr "Server Skedarësh"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
-msgstr ""
+msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Server i Emrit (DNS) dhe Server i Informacionit (NIS)"
 
-#: share/meta-task/compssUsers.pl:100
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:112
+#, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Server Stampues"
+msgstr "Server Shpërndarës Skedarësh dhe Printeri"
 
-#: share/meta-task/compssUsers.pl:101
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:113
+#, c-format
 msgid "NFS Server, Samba server"
-msgstr "Server Samba"
+msgstr "NFS Server, Samba server"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Bazë e të dhënave"
 
-#: share/meta-task/compssUsers.pl:105
-#, fuzzy, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Server PostgreSQL apo MySQL i bazës së të dhënave"
+#: share/meta-task/compssUsers.pl:118
+#, c-format
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Mail"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Server i letrave (mail) Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server PostgreSQL apo MySQL i bazës së të dhënave"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Server PostgreSQL apo MariaDB i bazës së të dhënave"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Server Kompjuter Rrjeti"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Server NFS, server SMB, server Proxy, server ssh"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Mjedis Grafikë"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Stacioni punues KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -597,12 +731,12 @@ msgid ""
 msgstr ""
 "Mjedisi i Tryezës K, dhe grafiku basic, i mjedisit me koleksionimin e veglave"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Stacioni punues Gnome"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -611,69 +745,124 @@ msgstr ""
 "Një mjedis grafikë me përdorues-miqësie, një përgjithësi e palikacioneve dhe "
 "vegla në tryezë"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Një mjedis grafik i bazuar në GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "Tryeza"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Një mjedis grafikë me përdorues-miqësie, një përgjithësi e palikacioneve dhe "
-"vegla në tryezë"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Mjedise të Tjera Grafike në Tryezë"
 
-#: share/meta-task/compssUsers.pl:150
-#, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etj."
+#: share/meta-task/compssUsers.pl:200
+#, c-format
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:223
+#, c-format
 msgid "Utilities"
-msgstr "Filipinet"
+msgstr "Shërbime"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Server SSH"
 
-#: share/meta-task/compssUsers.pl:180
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:230
+#, c-format
 msgid "Webmin"
-msgstr "Webcam"
+msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:231
+#, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Konfigurim i Serverit me Terminale Mageia"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:185
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:235
+#, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Vështrimi i Rrjetit (Network)"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:240
+#, c-format
 msgid "Mageia Wizards"
-msgstr "Qendra Kontrolluese Mageia Linux"
+msgstr "Magjistari Mageia"
 
-#: share/meta-task/compssUsers.pl:191
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:241
+#, c-format
 msgid "Wizards to configure server"
-msgstr "Dështim gjatë konfigurim të stampuesit %s\"!"
+msgstr "Magjistarët për të konfiguruar serverin"
 
 #: steps.pm:85
 #, c-format
@@ -684,7 +873,7 @@ msgstr ""
 "Një gabim është paraqitur, dhe me sa duket është vështir të zgjidhet.\n"
 "Ju mund të vazhdoni, mirëpo ju jeni përgjegjës për ndonji gabim eventual."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -704,335 +893,335 @@ msgstr "Nisja e etapës `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Instalimi i Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Instalimi i %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab> para /<Alt-Tab> mbrapa"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
-msgstr ""
+msgstr "Xorg server është i ngadalshëm për të filluar. Ju lutem prisni..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Kompjuteri i juaj posedon sasi të vogël të memorisë. Ju mund të ndesheni me\n"
-"disa probleme gjatë instalimit të Mageia Linux. Nëse kjo ndodhë, ju\n"
+"disa probleme gjatë instalimit të %s. Nëse kjo ndodhë, ju\n"
 "mund të vazhdoni në një instalim në modë teksti. Për këtë shtypni mbi\n"
 "`F1' kut të niseni me një nisje të udhëzuar në CDROM, dhe fytni urdhërin "
 "`text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr ""
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "Instalim minimal"
+msgstr ""
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "Tryeza"
+msgstr "KDE Desktop"
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "Tryeza"
+msgstr "GNOME Desktop"
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "Tryeza"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Zgjedhni Grupet e Pakove"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Zgjedhni pakot individualisht"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Madhësia totale: %d / %d MB"
+msgid "Unselect All"
+msgstr "Gjitha të Çzgjedhurat"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Pako jo e mirë"
+msgid "Total size: %d / %d MB"
+msgstr "Madhësia totale: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versioni: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Madhësia: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Me rëndësi: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Ju nuk mund ti zgjedhni/çzgjedhni këtë pako"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "ka arritur nga mungesa %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "ka arritur gjatë mosmarrëveshjes %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "tentim në gradimin e %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "në urdhër për ta mbajturë %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Nu nuk mund ta zgjidhni këtë pako, sepse nuk ka vend të mjaftueshëm për ta "
 "instaluar"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Pakot e radhitura do të instalohen"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Pakot e radhitura do të zhduken"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Kjo është një pako e nevojshme, dhe nuk mund çzgjedhet"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Ju nuk mund ta çzgjedhni këtë pako. Është e instaluar më parë"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Ju nuk mund ti çzgjedhni këtë pako. Duhet të azhurnohet"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Paraqiti automatikisht pakot e zgjedhura"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instalim"
 
-#: steps_gtk.pm:499
-#, fuzzy, c-format
+#: steps_gtk.pm:515
+#, c-format
 msgid "Load/Save selection"
-msgstr "Zgjedhja e pakos"
+msgstr "Ngarko/Ruaj përzgjedhje"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Azhurnimi i pakove të zgjedhura"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Instalim minimal"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Menagjuesi Softver"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Zgjedhi pakot të cilat dëshironi t'instaloni"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instalimi"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Asnjë detaj"
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "Koha e mbetur"
+msgstr "Koha e mbetur:"
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "Vlerësimi në sipër"
+msgstr "(vlerësim...)"
 
-#: steps_gtk.pm:615
-#, fuzzy, c-format
+#: steps_gtk.pm:631
+#, c-format
 msgid "%d package"
 msgid_plural "%d packages"
-msgstr[0] "%d pakot"
-msgstr[1] "%d pakot"
+msgstr[0] "%d paketë"
+msgstr[1] "%d paketat"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Përmbledhje"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Konfiguroje"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "i pa konfiguruar"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Zgjedhni Grupet e Pakove"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
-msgstr ""
+msgstr "Kopjo tërë CDtë"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Një gabim është paraqitur"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Ju lutemi zgjedheni tipin tastierës suaj"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "Ja ku është lista komplete e shteteve në disponibilitet"
+msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalo/Azhurno"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Është ky një instalim apo një azhurnim?"
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
-msgstr "Instalim"
+msgstr "Instalimi"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Azhurno %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Çelës i kriptuar për %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
-msgstr ""
+msgstr "Anulo instalimin, rifillo sistemin"
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "Instalimi"
+msgstr "Instalim i Ri"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
-msgstr ""
+msgstr "Përmirëso instalimin e mëparshme (nuk rekomandohet)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1041,38 +1230,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Konfigurimi i IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Nuk ka hepësirë të lirë, për ndarjen me nisje të udhëzuar (bootstrap) me 1MB!"
-"Instalimi do të vazhdoj, ju duhet të krijoni një ndarje me nisje të udhëzuar"
-"(bootstrap) në DiskDrake"
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Nuk ka hepësirë të lirë, për ndarjen me nisje të udhëzuar (bootstrap) me 1MB!"
-"Instalimi do të vazhdoj, ju duhet të krijoni një ndarje me nisje të udhëzuar"
-"(bootstrap) në DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1086,74 +1254,71 @@ msgstr ""
 "Nëse ju nuk e posedoni, shtypni mbi kopsën Anulo që më në fund të mos "
 "instaloni asgjë nga ky Cd-Rom."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Hetim mbi pakot e lira..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
-#, fuzzy, c-format
+#: steps_interactive.pm:428
+#, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
-"Ju lutemi zgjedhni ngarkimin apo shpëtimin e pakos së zgjedhur në floppy "
-"disketë.\n"
-"Forma është e njëjtë sikur në disketë me tërheqje të instalimit automatikë."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Ngarko"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Shpëtoje"
 
-#: steps_interactive.pm:453
-#, fuzzy, c-format
+#: steps_interactive.pm:438
+#, c-format
 msgid "Bad file"
-msgstr "Ngarko file"
+msgstr "Skedarë keq"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "Zgjedhni Grupet e Pakove"
+msgstr "Përzgjedhje Desktop"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Madhësia e zgjedhur është shumë më e gjatë se sa hapësira e lirë"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tipi i instalimit"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1162,87 +1327,111 @@ msgstr ""
 "Ju nuk e keni zgjedhur asnjë grup të pakove.\n"
 "Ju lutemi zgjedheni një instalim minimal të dëshiruar:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Me X"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Instalimi i pakove %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr "Instalimi paketave rekomanduara"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Me dokumentacion bazues (rekomanduar!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Instalim tejet minimal (në veçanti pa urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Pregatitje për instalim"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instalimi i pakove %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Një gabim është paraqitur gjatë radhitjes së pakove:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Vazhdo pa marrë parasysh?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Riprovo"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
-msgstr ""
+msgstr "Kalo këtë paketë"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
-#, fuzzy, c-format
+#: steps_interactive.pm:682
+#, c-format
 msgid "Go back to media and packages selection"
-msgstr "Regjistroi pakot e zgjedhura"
+msgstr ""
 
-#: steps_interactive.pm:683
-#, fuzzy, c-format
+#: steps_interactive.pm:685
+#, c-format
 msgid "There was an error installing package %s."
-msgstr "Një gabim është paraqitur gjatë instalimit të pakove:"
+msgstr ""
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Konfigurimi i postit-instalues"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
-#, fuzzy, c-format
+#: steps_interactive.pm:739 steps_list.pm:47
+#, c-format
 msgid "Updates"
-msgstr "Azhurnimi"
+msgstr "Azhurnime"
+
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1263,127 +1452,115 @@ msgstr ""
 "\n"
 "A dëshironi t'instaloni këto azhurnime ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s mbi %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardver"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Kartelë zëri"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "A posedoni një kartelë zëri ISA?"
 
-#: steps_interactive.pm:921
-#, fuzzy, c-format
+#: steps_interactive.pm:931
+#, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
-"Nise \"sndconfig\" mbasë instalimit për ta konfiguruar kartëlën e zërit"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Asnjë kartelë e zbuluar. Provo \"harddrake\" mbasë instalimit"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Interfaci grafik"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Rrjeti & Internet"
 
-#: steps_interactive.pm:949
-#, fuzzy, c-format
+#: steps_interactive.pm:960
+#, c-format
 msgid "Proxies"
-msgstr "Profili "
+msgstr ""
 
-#: steps_interactive.pm:950
-#, fuzzy, c-format
+#: steps_interactive.pm:961
+#, c-format
 msgid "configured"
-msgstr "rikonfiguroje"
+msgstr "konfiguruar"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Nivel i Sigurisë"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Mur i Zjarrt"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktivizuar"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "i nxënë"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Ju nuk e keni konfiguruar serverin X. A jeni i sigurt, se e dëshironi këtë?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Pregatitja e bootloader..."
+msgid "Preparing initial startup program..."
+msgstr ""
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, fuzzy, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Me sa duket makina juaj posedon një arqitekturë të vjetër apo të pa\n"
-" njoftur, programi për nisje të udhëzuar yabbot nuk do të funksionoj.\n"
-"Dhe instalimi do të vazhdoj më tutje, mirëpo ju\n"
-" duhet të posedoni BootX që ta nisni sistemin tuaj"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Futni një disketë të zbrazët në lexuesin e disketave %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Krijimi i një diskete auto instaluese..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1394,12 +1571,12 @@ msgstr ""
 "\n"
 "A dëshironi me të vërtetë ti braktisni tani?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Urime"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Rinise (riboot)"
@@ -1415,7 +1592,7 @@ msgstr "Zgjedheni gjuhën tuaj"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "Vendndodhja"
 
 #: steps_list.pm:17
 #, c-format
@@ -1436,7 +1613,7 @@ msgstr "Mini"
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
-msgstr "Zbulim i Diskut të Fortë (Hard drive)"
+msgstr "Zbulim i Diskut të Fortë (Hard disk drive)"
 
 #: steps_list.pm:21 steps_list.pm:22
 #, c-format
@@ -1444,6 +1621,8 @@ msgid ""
 "_: Keep these entry short\n"
 "Installation class"
 msgstr ""
+"_: Mbani këto hyrje të shkurtra\n"
+"klasë Instalimi"
 
 #: steps_list.pm:23
 #, c-format
@@ -1472,6 +1651,8 @@ msgid ""
 "_: Keep these entry short\n"
 "Formatting"
 msgstr ""
+"_: Mbani këto hyrje të shkurtra\n"
+"Shpërndarja"
 
 #: steps_list.pm:29
 #, c-format
@@ -1479,6 +1660,8 @@ msgid ""
 "_: Keep these entry short\n"
 "Choosing packages"
 msgstr ""
+"_: Mbani këto hyrje të shkurtra\n"
+"Zgjedhja paketave"
 
 #: steps_list.pm:31
 #, c-format
@@ -1494,13 +1677,6 @@ msgid ""
 "Users"
 msgstr "Përdoruesit"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Punimi i rrjetit"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1535,6 +1711,8 @@ msgid ""
 "_: Keep these entry short\n"
 "Updates"
 msgstr ""
+"_: Mbani këto hyrje të shkurtra\n"
+"Azhurnime"
 
 #: steps_list.pm:48
 #, c-format
@@ -1542,143 +1720,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Braktise"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programe për tryezë: trajtues të teksteve (kword, abiword), tablues "
-#~ "(kspread, gnumeric), çfaqës pdf, etj."
-
-#, fuzzy
-#~ msgid "Downloading file %s..."
-#~ msgstr "Dërgimi i skedareve..."
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Ju keni zgjedhur server(et) e radhitur: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Këta server janë të aktivizuar me marrëveshje. Ata nuk kanë ndonji dalje\n"
-#~ "të siguruar, mirëpo probleme të reja mund të paraqiten. Në ato momente\n"
-#~ "ju duhet të jeni i sigurt që ti azhurnoni serverat tuja sa më shpejt.\n"
-#~ "\n"
-#~ "\n"
-#~ "Me të vërtetë dëshironi t'instaloni këta server?\n"
-
-#, fuzzy
-#~ msgid "IceWm Desktop"
-#~ msgstr "Tryeza"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "Transferimi i listës së pasqyreve me pako të lira..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Nuk mundur të kontaktohet pasqyrja %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Krijo një disketë auto instaluese"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "Auto instalimi mund të bëhet me instalim të automatizuar, nëse\n"
-#~ "dëshironi, ai do të merë kontrolin mbi diskun tuaj të fort!!\n"
-#~ "(është i përcaktuar për instalimin njodnjë makine tjetër).\n"
-#~ "\n"
-#~ "A dëshironi ta përsëritni instalimin.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Rilexo"
-
-#~ msgid "Automated"
-#~ msgstr "Automatizuar"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Regjistroi pakot e zgjedhura"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "A dëshironi ta përdorni aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Gabim gjatë instalimit aboot, \n"
-#~ "mundohu me instalim të forcuar, edhe pse ai do ta shkatërroj ndarjen e "
-#~ "parë?"
-
-#~ msgid "All"
-#~ msgstr "Gjitha"
-
-#~ msgid "TV card"
-#~ msgstr "Kartelë TV"
-
-#~ msgid "Boot"
-#~ msgstr "Boot"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Vërtetësimi"
-
-#, fuzzy
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "%d pakot"
-#~ msgstr[1] "%d pakot"
-
-#~ msgid "%d packages"
-#~ msgstr "%d pakot"
-
-#~ msgid "Language"
-#~ msgstr "Zgjedheni gjuhën tuaj"
-
-#~ msgid "License"
-#~ msgstr "Licenca"
-
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "Zgjedhe klasën e instalimit"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "Vlerësimi në sipër"
-
-#, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "Zgjedhi pakot instaluese"
-
-#~ msgid "Users"
-#~ msgstr "Përdoruesit"
-
-#~ msgid "Networking"
-#~ msgstr "Punimi i rrjetit"
-
-#~ msgid "Configure X"
-#~ msgstr "Konfigurim i X"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "Nuk mund të hyjë në modulet të cilat i përkasin bërthamës suaj (skedarja "
-#~ "%s mungon), kjo zakonisht do të thotë se disketa juaj me nisje të "
-#~ "udhëzuar nuk sinkronizohet, me burimin instalues (ju lutemi krijoni një "
-#~ "disketë të re)"
diff --git a/perl-install/install/share/po/sr.po b/perl-install/install/share/po/sr.po
index 8d34b98d0..b9e1fc94a 100644
--- a/perl-install/install/share/po/sr.po
+++ b/perl-install/install/share/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2004-09-15 13:33+0200\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -19,38 +19,63 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Радна(Office) �таница"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "For developers!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Thank you!"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Да ли имате још додатних медија?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -63,92 +88,88 @@ msgstr ""
 "\n"
 "Да ли имате додатних ин�талационих медија које треба поде�ити?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Мрежа (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Мрежа (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Мрежа (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "УРЛ мирора?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "УРЛ мора почињати �а ftp:// или http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Контактирајте Mageia Linux web �ајт да би добили ли�ту до�тупних mirror-а..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Контактирајте %s web �ајт да би добили ли�ту до�тупних mirror-а..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"�еу�пешно у�по�тављање везе �а Mageia Linux web �ајт ради ли�те до�тупних "
-"mirror-а"
+"�еу�пешно у�по�тављање везе �а %s web �ајт ради ли�те до�тупних mirror-а"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Изаберите mirror �а ког ћете �кинути пакете"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Подешавање NFS-а"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Уне�ите име домаћина-hostname и директоријум вашег NFS медија"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "�едо�таје име домаћина-hostname"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Директоријум мора почети �а  \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Име домаћина-hostname за монтирање NFS ?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Директоријум"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Додатни"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -157,23 +178,90 @@ msgstr ""
 "�е могу пронађем ли�ту пакета на овом мирору. проверите да ли локација "
 "и�правна."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Тражим већ ин�талиране пакете..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Тражим пакете за ажурирање..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -186,87 +274,87 @@ msgstr ""
 "\n"
 "Да ли заи�та желите да уклоните ове пакете?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Грешка код отварања датотека %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Следећи ди�к(ови) ће бити преименовани:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (раније �а именом %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Мрежа"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Изаберите медиј"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Датотека већ по�тоји. Да ли препишем преко по�тојеће?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "При�туп одбијен"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Погрешно NFS име"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Лош медиј %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "�е могу да направим �нимак пре партиционирања"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Снимци ће бити до�тупни након ин�талације у %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Ин�талација"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Конфигурација"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Морате и %s да форматирате"
@@ -291,22 +379,22 @@ msgstr "При�тупам  мрежу"
 msgid "Bringing down the network"
 msgstr "Од�тупам од мреже"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Копирање неких поакета на ди�кове ради ка�није употребе"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Копирање у току"
@@ -336,73 +424,98 @@ msgstr "лепо"
 msgid "maybe"
 msgstr "можда"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Без опи�а"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Хм,појавила �е грешка"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Појавила �е фатална грешка: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d ин�тлациона тран�акција није у�пела"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Ин�талирам пакет %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Радна �таница"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Радна(Office) �таница"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Office програми: тек�т проце�ори (OpenOffice.org Writer, Kword), табеле "
-"(OpenOffice.org Calc, Kspread), pdf прегледници, итд"
+"Office програми: тек�т проце�ори (LibreOffice Writer, Kword), табеле "
+"(LibreOffice Calc, Kspread), pdf прегледници, итд"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Станица за игру"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Забавни програми: аркаде, иге на табли, �тратегије, итд"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Мултимедијална �таница"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Програми за пуштање звука и видеа"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Интернет �таница"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -411,193 +524,193 @@ msgstr ""
 "Скуп алата за читање и �лање ел.поште и ве�ти (mutt, tin..) и за "
 "претраживање Интернета"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Мрежни компјутер (клијент)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клијенти за различите протоколе укључујући и ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "�лати за лако конфигури�ање компјутера"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Конзолни алати"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Развојна"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Документација"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Књиге и Како? (Howto's) за Linux и Бе�платни Софтвер"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Линук�ова Стандардна База. Подршка за Third party апликаицје"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Веб Сервер"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Софтвер за групни рад"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Сервер"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Интернет gateway"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Ел.пошта/ве�ти"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix �ервер за ел.пошту,Inn �ервер за ве�ти "
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Сервер директоријума"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Сервер"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Име Домена и Мрежни Информациони Сервер"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Фајл Сервер и �ервер за дељење штампача"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Сервер,Базе података"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL или MySQL �ервер за базу података"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL или MariaDB �ервер за базу података"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Сервер, Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix mail �ервер"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL или MySQL �ервер за базу података"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL или MariaDB �ервер за базу података"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Мрежни Сервер"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Графичко Окружење"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE падна �таница"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -605,12 +718,12 @@ msgid ""
 msgstr ""
 "K Де�ктоп окружење, о�новно графичко окружење �а колекцијом пратећих алата"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome радна �таница"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -619,66 +732,128 @@ msgstr ""
 "Графичка окружења за �етом кори�ничк NFS server, SMB server, Proxy server, "
 "NFS server, SMB server, Proxy �ерверих апликација и де�ктопалата"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE падна �таница"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Графичка окружења за �етом кори�ничк NFS server, SMB server, Proxy server, "
+"NFS server, SMB server, Proxy �ерверих апликација и де�ктопалата"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Gnome радна �таница"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Радна �таница"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Графичко Окружење"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "IceWm Де�ктоп"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Графичка окружења за �етом кори�ничк NFS server, SMB server, Proxy server, "
+"NFS server, SMB server, Proxy �ерверих апликација и де�ктопалата"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "IceWm Де�ктоп"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Графичка окружења за �етом кори�ничк NFS server, SMB server, Proxy server, "
 "NFS server, SMB server, Proxy �ерверих апликација и де�ктопалата"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "IceWm Де�ктоп"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"K Де�ктоп окружење, о�новно графичко окружење �а колекцијом пратећих алата"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Други графички де�ктопови"
 
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:200
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
 msgstr " Window Maker, Enlightenment, Fvwm, итд"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "�лати"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Сервер"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin �ервер за даљин�ку контролу"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Мрежни алати/Мониторинг"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "�лати за мониторинг, управљање проце�има, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia Чаробњаци"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Чаробњаци за подешавање �ервера"
@@ -692,7 +867,7 @@ msgstr ""
 "Грешка, али незнам како да је разрешим.\n"
 "�а�тавите на ваш ризик!"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -712,225 +887,230 @@ msgstr "Покрећем корак `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux Ин�талација %s"
+msgid "%s Installation %s"
+msgstr "%s Ин�талација %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> између елемената"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Ваш �и�тем има мањак �наге. У�лед тога можете имати проблема при "
 "ин�талацији\n"
-"Mageia Linux. Уколико �е они појаве, можете пробати тек�туалну ин�талацију. "
-"Да би то по�тигли,\n"
+"%s. Уколико �е они појаве, можете пробати тек�туалну ин�талацију. Да би то "
+"по�тигли,\n"
 "прити�ните `F1' при �тартању �а CDROM-а, а онда укуцајте  `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Одабир група пакета"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Минимално ин�талирај"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "IceWm Де�ктоп"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "IceWm Де�ктоп"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "IceWm Де�ктоп"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Одабир група пакета"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Појединачно бирање пакета"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Укупна величина: %d / %d MB"
+msgid "Unselect All"
+msgstr "Де�електуј Све"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Лош пакет"
+msgid "Total size: %d / %d MB"
+msgstr "Укупна величина: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Верзија: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Величина: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Важно�т: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "�е можете �електовати/де�електовати овај пакет"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "због не по�тојања %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "због не задовољеног %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "покушавам да прикажем %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "да бих задржао %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "�е можете �електовати овај пакет јер нема више �лободног про�тора"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Следећи пакети треба да буду ин�талирани"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Следећи пакети ће бити избри�ани"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ово је обавезни пакет,и не може бити де�електован"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Можете де�електовати овај пакет јер је већ ин�талиран"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "�е можете де�електовати овај пакет.Он мора бити ажуриран"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "�утомат�ки прикажи изабране пакете"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Ин�талирај"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Учитај/Сачувај избор"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "�журирање �елекције пакета"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Минимално ин�талирај"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Подешавање Софтвера"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Изабери пакете за ин�талацију"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Ин�талирам"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Без детаља"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Прео�тало време"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Процењујем"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
@@ -938,27 +1118,22 @@ msgstr[0] "%d пакета"
 msgstr[1] "%d пакета"
 msgstr[2] "%d пакета"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Сажетак"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Поде�и"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "није подешено"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Одабир група пакета"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -967,84 +1142,84 @@ msgstr ""
 "Пронађени �у �ледећи ин�талациони медији.\n"
 "Уколико желите да пре�кочите неке од њих, де�електујте их �ада."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Имате могућно�т да копирате �адржај CD-ова на хард ди�к пре ин�талације.\n"
 "�акон тога ће ин�талција на�тавити �а хард ди�ка а пакети ће о�тати до�тупни "
 "и када �е заврши ин�талација."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Копирање целог CDа"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Хм,појавила �е грешка"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Изаберите  ра�поред та�татуре"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Овде је пред�тављена цела ли�та до�тупних ра�пореда за та�татуре"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Ин�талација/�журирање"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Да ли је ово ин�талација или ажурирање?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Ин�талирај"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "�журирање %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Кључ за енкрипцију за %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Ин�талација"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1053,37 +1228,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Конфигурација  IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"�ема �лободног про�тора за 1MB bootstrap! Ин�талација ђе �е на�тавити, али "
-"да би подигли ваш�и�тем, морађете да креирате bootstrap партицију у "
-"DiskDrake-у"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Морате креирати PPC PReP bootstrap! Ин�талација ђе �е на�тавити, али да би "
-"подигли ваш �и�тем, морађете да креирате bootstrap партицију у DiskDrake-у"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1097,12 +1252,12 @@ msgstr ""
 "�премни.\n"
 "Уколико га немате прити�ните  Поништи."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Тражим пакете"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1111,7 +1266,7 @@ msgstr ""
 "Ваш �и�тем нема довољно �лободног про�тора за ин�талацију или ажурирање "
 "�и�тема (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1120,52 +1275,52 @@ msgstr ""
 "Молим Ва� да изаберете учитавање или �нимање �елекције пакета.\n"
 "Формат који �е кори�ти је и�ти као и код  auto_install генери�аних фајлова."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Учитај"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Сачувај"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Лош фајл"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Одабир група пакета"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Селектована величина је веђа од �лободног про�тора"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Тип ин�талације"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1174,87 +1329,111 @@ msgstr ""
 "�и�те �електовали ниједну групу пакета.\n"
 "Изаберите минималну ин�талацију коју желите:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Са X-овима"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Ин�талирам пакет %s"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Са о�новном документацијом (препорука!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Стварно минимална ин�талација (по�ебно без urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Припремам �тартер..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Припремам ин�талацију"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Ин�талирам пакет %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Грешка у ли�ти пакета:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Свеједно на�тавити даље ?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Обнови"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Сачувај �елекцију пакета"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Грешка при ин�талацији пакета:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "По�тин�талациона конфигурација"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Проверите да ли �е у уређају %s налази медиј за ажурирање модула"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "�журирање"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1274,28 +1453,29 @@ msgstr ""
 "\n"
 "да ли желите да ин�талирате update-ове ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Хардвер"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Звучна картица"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Да ли имате ISA звучну картицу?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1304,81 +1484,69 @@ msgstr ""
 "Покрените \"alsaconf\" или \"sndconfig\" након и�нталације да би поде�или "
 "�воју звучну картицу"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "�ије детектована звучна картица. Покрените \"harddrake\" након ин�талације"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Графички интерфеј�"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Мрежа и Интернет"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Прок�ији"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "подешено"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "�иво �игурно�ти"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Заштитни зид (Firewall)"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "�ктивирано"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "онемогућено"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "�и�те поде�или X. Да ли �те �игурни да желите то?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Припремам �тартер..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Припремам ин�талацију"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Пошто изгледа да имате �таромодну или непознату машину, yaboot �тартер неђе "
-"радити код ва�.Ин�талација ће бити на�тављена, али ћете морати да кори�тите "
-"BootX или нешто друго да би подигли �и�тем. �ргумент кернела заroot fs je: "
-"root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1387,17 +1555,17 @@ msgstr ""
 "У овом �угурно�ном нивоу при�туп фајловима на Windows партицији је дозвољен "
 "�амо админи�траторима."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Убаците празну ди�кету у уређај %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Креирам ауто ин�талациони флопи"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1408,12 +1576,12 @@ msgstr ""
 "\n"
 "Да ли �тварно желите да завршите ?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Че�титке"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Ре�тарт"
@@ -1508,13 +1676,6 @@ msgid ""
 "Users"
 msgstr "Кори�ници"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Мрежа"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1557,6 +1718,67 @@ msgid ""
 "Exit"
 msgstr ""
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Припремам �тартер..."
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Графичка окружења за �етом кори�ничк NFS server, SMB server, Proxy "
+#~ "server, NFS server, SMB server, Proxy �ерверих апликација и де�ктопалата"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "IceWm Де�ктоп"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "�ема �лободног про�тора за 1MB bootstrap! Ин�талација ђе �е на�тавити, "
+#~ "али да би подигли ваш�и�тем, морађете да креирате bootstrap партицију у "
+#~ "DiskDrake-у"
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "Морате креирати PPC PReP bootstrap! Ин�талација ђе �е на�тавити, али да "
+#~ "би подигли ваш �и�тем, морађете да креирате bootstrap партицију у "
+#~ "DiskDrake-у"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Пошто изгледа да имате �таромодну или непознату машину, yaboot �тартер "
+#~ "неђе радити код ва�.Ин�талација ће бити на�тављена, али ћете морати да "
+#~ "кори�тите BootX или нешто друго да би подигли �и�тем. �ргумент кернела "
+#~ "заroot fs je: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Добродошли"
+
+#~ msgid "Select All"
+#~ msgstr "Селектуј Све"
+
+#~ msgid "Bad package"
+#~ msgstr "Лош пакет"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Припремам �тартер..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Мрежа"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1606,7 +1828,7 @@ msgstr ""
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/sr@Latn.po b/perl-install/install/share/po/sr@Latn.po
index 828727e43..a393016cf 100644
--- a/perl-install/install/share/po/sr@Latn.po
+++ b/perl-install/install/share/po/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2004-09-15 13:33+0200\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -19,38 +19,63 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Radna(Office) stanica"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "For developers!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Thank you!"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Da li imate još dodatnih medija?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -63,92 +88,88 @@ msgstr ""
 "\n"
 "Da li imate dodatnih instalacionih medija koje treba podesiti?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Mreža (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Mreža (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Mreža (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL mirora?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL mora po�injati sa ftp:// ili http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Kontaktirajte Mageia Linux web sajt da bi dobili listu dostupnih mirror-a..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Kontaktirajte %s web sajt da bi dobili listu dostupnih mirror-a..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Neuspešno uspostavljanje veze sa Mageia Linux web sajt radi liste dostupnih "
-"mirror-a"
+"Neuspešno uspostavljanje veze sa %s web sajt radi liste dostupnih mirror-a"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Izaberite mirror sa kog ćete skinuti pakete"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Podešavanje NFS-a"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Unesite ime domaćina-hostname i direktorijum vašeg NFS medija"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Nedostaje ime domaćina-hostname"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Direktorijum mora po�eti sa  \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Ime domaćina-hostname za montiranje NFS ?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Direktorijum"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Dodatni"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -157,23 +178,90 @@ msgstr ""
 "Ne mogu pronađem listu paketa na ovom miroru. proverite da li lokacija "
 "ispravna."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Tražim već instalirane pakete..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Tražim pakete za ažuriranje..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Uklanjam stare pakete..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -186,87 +274,87 @@ msgstr ""
 "\n"
 "Da li zaista želite da uklonite ove pakete?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Greška kod otvaranja datoteka %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Sledeći disk(ovi) će biti preimenovani:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (ranije sa imenom %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Mreža"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Izaberite medij"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Datoteka već postoji. Da li prepišem preko postojeće?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Pristup odbijen"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Pogrešno NFS ime"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Loš medij %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Ne mogu da napravim snimak pre particioniranja"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Snimci će biti dostupni nakon instalacije u %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Instalacija"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfiguracija"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Morate i %s da formatirate"
@@ -291,22 +379,22 @@ msgstr "Pristupam  mrežu"
 msgid "Bringing down the network"
 msgstr "Odstupam od mreže"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiranje nekih poaketa na diskove radi kasnije upotrebe"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiranje u toku"
@@ -336,73 +424,98 @@ msgstr "lepo"
 msgid "maybe"
 msgstr "možda"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Bez opisa"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Hm,pojavila se greška"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Pojavila se fatalna greška: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instlaciona transakcija nije uspela"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Instaliram paket %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Radna stanica"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Radna(Office) stanica"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Office programi: tekst procesori (OpenOffice.org Writer, Kword), tabele "
-"(OpenOffice.org Calc, Kspread), pdf preglednici, itd"
+"Office programi: tekst procesori (LibreOffice Writer, Kword), tabele "
+"(LibreOffice Calc, Kspread), pdf preglednici, itd"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Stanica za igru"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Zabavni programi: arkade, ige na tabli, strategije, itd"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedijalna stanica"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programi za puštanje zvuka i videa"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet stanica"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -411,193 +524,193 @@ msgstr ""
 "Skup alata za �itanje i slanje el.pošte i vesti (mutt, tin..) i za "
 "pretraživanje Interneta"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Mrežni kompjuter (klijent)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klijenti za razli�ite protokole uklju�ujući i ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Alati za lako konfigurisanje kompjutera"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konzolni alati"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "editori,Å¡elovi, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Razvojna"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C i C++ razvojne biblioteke, programi  i propratne datoteke"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Knjige i Kako? (Howto's) za Linux i Besplatni Softver"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux-ova Standardna Baza. Podrška za Third party aplikaicje"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Veb Server"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Softver za grupni rad"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Server, Firewall/Router"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet gateway"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "El.pošta/vesti"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix server za el.poštu,Inn server za vesti "
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Server direktorijuma"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Server"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Ime Domena i Mrežni Informacioni Server"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fajl Server i server za deljenje štampa�a"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Server,Baze podataka"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL ili MySQL server za bazu podataka"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL ili MariaDB server za bazu podataka"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Server, Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Pošta"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix mail server"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ili MySQL server za bazu podataka"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL ili MariaDB server za bazu podataka"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Mrežni Server"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafi�ko Okruženje"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE padna stanica"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -605,12 +718,12 @@ msgid ""
 msgstr ""
 "K Desktop okruženje, osnovno grafi�ko okruženje sa kolekcijom pratećih alata"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome radna stanica"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -619,66 +732,128 @@ msgstr ""
 "Grafi�ka okruženja za setom korisni�k NFS server, SMB server, Proxy server, "
 "NFS server, SMB server, Proxy serverih aplikacija i desktopalata"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE padna stanica"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Grafi�ka okruženja za setom korisni�k NFS server, SMB server, Proxy server, "
+"NFS server, SMB server, Proxy serverih aplikacija i desktopalata"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Gnome radna stanica"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Radna stanica"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Grafi�ko Okruženje"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "IceWm Desktop"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Grafi�ka okruženja za setom korisni�k NFS server, SMB server, Proxy server, "
+"NFS server, SMB server, Proxy serverih aplikacija i desktopalata"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "IceWm Desktop"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Grafi�ka okruženja za setom korisni�k NFS server, SMB server, Proxy server, "
 "NFS server, SMB server, Proxy serverih aplikacija i desktopalata"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "IceWm Desktop"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"K Desktop okruženje, osnovno grafi�ko okruženje sa kolekcijom pratećih alata"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Drugi grafi�ki desktopovi"
 
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:200
+#, 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:223
 #, c-format
 msgid "Utilities"
 msgstr "Alati"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Server"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin server za daljinsku kontrolu"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Mrežni alati/Monitoring"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Alati za monitoring, upravljanje procesima, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia ÄŒarobnjaci"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Čarobnjaci za podešavanje servera"
@@ -692,7 +867,7 @@ msgstr ""
 "Greška, ali neznam kako da je razrešim.\n"
 "Nastavite na vaš rizik!"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -712,225 +887,230 @@ msgstr "Pokrećem korak `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux Instalacija %s"
+msgid "%s Installation %s"
+msgstr "%s Instalacija %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> između elemenata"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vaš sistem ima manjak snage. Usled toga možete imati problema pri "
 "instalaciji\n"
-"Mageia Linux. Ukoliko se oni pojave, možete probati tekstualnu instalaciju. "
-"Da bi to postigli,\n"
+"%s. Ukoliko se oni pojave, možete probati tekstualnu instalaciju. Da bi to "
+"postigli,\n"
 "pritisnite `F1' pri startanju sa CDROM-a, a onda ukucajte  `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Odabir grupa paketa"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Minimalno instaliraj"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "IceWm Desktop"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "IceWm Desktop"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "IceWm Desktop"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Odabir grupa paketa"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Pojedina�no biranje paketa"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Ukupna veli�ina: %d / %d MB"
+msgid "Unselect All"
+msgstr "Deselektuj Sve"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Loš paket"
+msgid "Total size: %d / %d MB"
+msgstr "Ukupna veli�ina: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Verzija: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Veli�ina: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Važnost: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Ne možete selektovati/deselektovati ovaj paket"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "zbog ne postojanja %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zbog ne zadovoljenog %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokušavam da prikažem %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "da bih zadržao %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Ne možete selektovati ovaj paket jer nema više slobodnog prostora"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Sledeći paketi treba da budu instalirani"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Sledeći paketi će biti izbrisani"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ovo je obavezni paket,i ne može biti deselektovan"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Možete deselektovati ovaj paket jer je već instaliran"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Ne možete deselektovati ovaj paket.On mora biti ažuriran"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Automatski prikaži izabrane pakete"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Instaliraj"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "U�itaj/Sa�uvaj izbor"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Ažuriranje selekcije paketa"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimalno instaliraj"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Podešavanje Softvera"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Izaberi pakete za instalaciju"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Instaliram"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Bez detalja"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Preostalo vreme"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Procenjujem"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
@@ -938,27 +1118,22 @@ msgstr[0] "%d paketa"
 msgstr[1] "%d paketa"
 msgstr[2] "%d paketa"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Sažetak"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Podesi"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "nije podešeno"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Odabir grupa paketa"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -967,84 +1142,84 @@ msgstr ""
 "Pronađeni su sledeći instalacioni mediji.\n"
 "Ukoliko želite da presko�ite neke od njih, deselektujte ih sada."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Imate mogućnost da kopirate sadržaj CD-ova na hard disk pre instalacije.\n"
 "Nakon toga će instalcija nastaviti sa hard diska a paketi će ostati dostupni "
 "i kada se završi instalacija."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiranje celog CDa"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Hm,pojavila se greška"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Izaberite  raspored tastature"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Ovde je predstavljena cela lista dostupnih rasporeda za tastature"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Instalacija/Ažuriranje"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Da li je ovo instalacija ili ažuriranje?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Instaliraj"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Ažuriranje %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Klju� za enkripciju za %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Instalacija"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1053,37 +1228,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Konfiguracija  IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Nema slobodnog prostora za 1MB bootstrap! Instalacija Ä‘e se nastaviti, ali "
-"da bi podigli vašsistem, morađete da kreirate bootstrap particiju u "
-"DiskDrake-u"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Morate kreirati PPC PReP bootstrap! Instalacija Ä‘e se nastaviti, ali da bi "
-"podigli vaš sistem, morađete da kreirate bootstrap particiju u DiskDrake-u"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1097,12 +1252,12 @@ msgstr ""
 "spremni.\n"
 "Ukoliko ga nemate pritisnite  Poništi."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Tražim pakete"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1111,7 +1266,7 @@ msgstr ""
 "Vaš sistem nema dovoljno slobodnog prostora za instalaciju ili ažuriranje "
 "sistema (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1120,52 +1275,52 @@ msgstr ""
 "Molim Vas da izaberete u�itavanje ili snimanje selekcije paketa.\n"
 "Format koji se koristi je isti kao i kod  auto_install generisanih fajlova."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "U�itaj"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Sa�uvaj"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Loš fajl"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Odabir grupa paketa"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Selektovana veli�ina je veđa od slobodnog prostora"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Tip instalacije"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1174,87 +1329,111 @@ msgstr ""
 "Niste selektovali nijednu grupu paketa.\n"
 "Izaberite minimalnu instalaciju koju želite:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Sa X-ovima"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Instaliram paket %s"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Sa osnovnom dokumentacijom (preporuka!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Stvarno minimalna instalacija (posebno bez urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Pripremam starter..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Pripremam instalaciju"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Instaliram paket %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Greška u listi paketa:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Svejedno nastaviti dalje ?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Obnovi"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Sa�uvaj selekciju paketa"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Greška pri instalaciji paketa:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Postinstalaciona konfiguracija"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Proverite da li se u uređaju %s nalazi medij za ažuriranje modula"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Ažuriranje"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1274,28 +1453,29 @@ msgstr ""
 "\n"
 "da li želite da instalirate update-ove ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardver"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Zvu�na kartica"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Da li imate ISA zvu�nu karticu?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1304,81 +1484,69 @@ msgstr ""
 "Pokrenite \"alsaconf\" ili \"sndconfig\" nakon isntalacije da bi podesili "
 "svoju zvu�nu karticu"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Nije detektovana zvu�na kartica. Pokrenite \"harddrake\" nakon instalacije"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafi�ki interfejs"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Mreža i Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proksiji"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "podešeno"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Nivo sigurnosti"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Zaštitni zid (Firewall)"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "Aktivirano"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "onemogućeno"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Niste podesili X. Da li ste sigurni da želite to?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Pripremam starter..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Pripremam instalaciju"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Pošto izgleda da imate staromodnu ili nepoznatu mašinu, yaboot starter neđe "
-"raditi kod vas.Instalacija će biti nastavljena, ali ćete morati da koristite "
-"BootX ili nešto drugo da bi podigli sistem. Argument kernela zaroot fs je: "
-"root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1387,17 +1555,17 @@ msgstr ""
 "U ovom sugurnosnom nivou pristup fajlovima na Windows particiji je dozvoljen "
 "samo administratorima."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Ubacite praznu disketu u uređaj %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Kreiram auto instalacioni flopi"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1408,12 +1576,12 @@ msgstr ""
 "\n"
 "Da li stvarno želite da završite ?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "ÄŒestitke"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Restart"
@@ -1508,13 +1676,6 @@ msgid ""
 "Users"
 msgstr "Korisnici"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Mreža"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1557,6 +1718,67 @@ msgid ""
 "Exit"
 msgstr "Izlaz"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Pripremam starter..."
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Grafi�ka okruženja za setom korisni�k NFS server, SMB server, Proxy "
+#~ "server, NFS server, SMB server, Proxy serverih aplikacija i desktopalata"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "IceWm Desktop"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "Nema slobodnog prostora za 1MB bootstrap! Instalacija Ä‘e se nastaviti, "
+#~ "ali da bi podigli vašsistem, morađete da kreirate bootstrap particiju u "
+#~ "DiskDrake-u"
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "Morate kreirati PPC PReP bootstrap! Instalacija Ä‘e se nastaviti, ali da "
+#~ "bi podigli vaš sistem, morađete da kreirate bootstrap particiju u "
+#~ "DiskDrake-u"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Pošto izgleda da imate staromodnu ili nepoznatu mašinu, yaboot starter "
+#~ "neđe raditi kod vas.Instalacija će biti nastavljena, ali ćete morati da "
+#~ "koristite BootX ili nešto drugo da bi podigli sistem. Argument kernela "
+#~ "zaroot fs je: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Dobrodošli"
+
+#~ msgid "Select All"
+#~ msgstr "Selektuj Sve"
+
+#~ msgid "Bad package"
+#~ msgstr "Loš paket"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Pripremam starter..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Mreža"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1606,7 +1828,7 @@ msgstr "Izlaz"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/sv.po b/perl-install/install/share/po/sv.po
index 52b4962fd..26b52416e 100644
--- a/perl-install/install/share/po/sv.po
+++ b/perl-install/install/share/po/sv.po
@@ -1,63 +1,92 @@
-# DrakX-sv - Swedish Translation
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
-# Copyright (C) 2000,2002,2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandriva
-#
-# Kenneth Krekula, 2005.
-# Fuad Sabanovic <manijak@telia.com>, 2000.
-# Mattias Dahlberg <voz@home.se>, 2001, 2002.
-# Mattias Newzella <newzella@linux.nu>, 2001, 2002,2003.
-# Magnus Björklöf <bjorklof@nic.fi>, 2003.
-# Lars Westergren <lars.westergren@home.se>, 2003, 2004, 2005.
-# Thomas Backlund <tmb@mandriva.org>, 2004, 2005, 2006, 2008, 2009.
-# Kenneth Krekula <kenneth.krekula@kiruna.se>, 2007.
+# Translators:
+# Fuad Sabanovic <manijak@telia.com>, 2000
+# Kenneth Krekula, 2005
+# Kenneth Krekula <kenneth.krekula@kiruna.se>, 2007
+# Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2013
+# Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2014
+# Lars Westergren <lars.westergren@home.se>, 2003-2005
+# Magnus Björklöf <bjorklof@nic.fi>, 2003
+# Mattias Dahlberg <voz@home.se>, 2001-2002
+# Mattias Newzella <newzella@linux.nu>, 2001-2003
+# Michael Eklund <willard@null.net>, 2014-2015
+# Thomas Backlund <tmb@mageia.org>, 2011
+# Thomas Backlund <tmb@mandriva.org>, 2004-2006,2008-2009
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-sv\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-10-11 13:04+0300\n"
-"Last-Translator: \n"
-"Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-26 19:12+0000\n"
+"Last-Translator: Michael Eklund <willard@null.net>\n"
+"Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/"
+"sv/)\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr "Anslut till oss!"
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr "Gör den din!"
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr "Ditt val!"
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, c-format
+msgid "Office tools"
+msgstr "Kontorsverktyg"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr "Hemunderhållning"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Ditt skrivbord på ett USB-minne"
+msgid "For kids"
+msgstr "För barn"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Den 100%% öppen källkod baserade Mageia Linux distributionen"
+msgid "For family!"
+msgstr "För familj!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Utforska Linux enkelt med Mageia One"
+msgid "For developers!"
+msgstr "För utvecklare!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "En komplett Mageia Linux skrivbordsmiljö, med support"
+msgid "Thank you!"
+msgstr "Tack så mycket!"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: distributioner för allas behov"
+msgid "Be Free!"
+msgstr "Var fri!"
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Har du fler tilläggs-installationskällor?"
+msgstr "Har du fler installationskällor att lägga till?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -65,122 +94,193 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
-"Följande medier har blivit hittade och kommer att användas under "
-"installationen: %s.\n"
+"Följande media har hittats och kommer att användas under installationen: "
+"%s.\n"
 "\n"
 "\n"
 "Har du några tilläggs-medier du vill konfigurera?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
-msgstr "Cd-rom"
+msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Nätverk (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Nätverk (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Nätverk (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Spegelns URL?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
-msgstr "URL måste starta med ftp:// eller http://"
+msgstr "En URL måste börja med ftp:// eller http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Kontaktar Mageia Linux webbplats för att hämta listan över tillgängliga "
-"speglar..."
+"Kontaktar %s webbplats för att hämta listan över tillgängliga speglar..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Misslyckades kontakta Mageia Linux webbplats för att hämta listan över "
+"Det gick inte att kontakta %s webbplats för att hämta listan över "
 "tillgängliga speglar"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
-msgstr "Välj en webbplats från vilken du vill hämta paketen"
+msgstr "Välj en webbplats där du vill hämta paketen från."
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
-msgstr "NFS konfigurering"
+msgstr "Konfigurera NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
-msgstr "Ange namn och katalog för ditt NFS medium"
+msgstr "Ange namn och katalog för ditt NFS-media"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Värdnamn saknas"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Katalogen måste börja med \"/\""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
-msgstr "Maskinnamn för NFS anslutning ?"
+msgstr "Värdnamn för NFS-anslutning ?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Katalog"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Tillägg"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
-msgstr "Kan inte hitta hdlist filen på denna spegel"
+msgstr "Kan inte hitta hdlist-filen på denna spegel"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Viss hårdvara i din dator behöver några firmwares från nonfree för att de "
+"fria drivrutinerna ska fungera."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Du borde aktivera \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" innehåller olika delar för systemet och dess program"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" innehåller nonfree-mjukvara.\n"
+
+#: any.pm:477
+#, 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 ""
+"Det innehåller också programvaror som behövs för att särskilda enheter ska "
+"fungera (t.ex. några grafikkort från ATI/AMD, nätverkskort och RAID-"
+"kort, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" innehåller mjukvara som inte kan distribueras i alla länder på grund "
+"av mjukvarupatent."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "Det innehåller även mjukvara från \"%s\" med extra möjligheter."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Här kan du aktivera fler medier om du vill."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Det här mediet erbjuder paket-uppdateringar för mediet \"%s\""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Söker efter paket som redan är installerade..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Söker efter paket att uppdatera..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Tar bort paket före uppgradering..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -193,87 +293,87 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa paket?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Fel vid läsning av fil %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Följande disk(ar) har döpts om:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (gamla namnet %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Nätverk"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Välj media"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Filen finns redan. Skriv över?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Ã…tkomst nekad"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
-msgstr "Felaktigt NFS namn"
+msgstr "Felaktigt NFS-namn"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Oanvändbart media %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Kan inte ta skärmdumpar före partitionering"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skärmdumpar kommer att finnas tillgängliga efter installationen i %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Installation"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Du måste också formatera %s"
@@ -284,8 +384,8 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"En del hårdvara i datorn behöver slutna drivrutiner för att\n"
-"fungera. Du kan hitta en del information om dem här: %s"
+"En del hårdvara i datorn behöver patenterade drivrutiner för att\n"
+"fungera. Du hittar en del information om dem här: %s"
 
 #: interactive.pm:22
 #, c-format
@@ -297,22 +397,22 @@ msgstr "Startar nätverket"
 msgid "Bringing down the network"
 msgstr "Stoppar nätverket"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Var god vänta, hämtar filen"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "kan inte lägga till media"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopierar några paket till hårddisken för senare användning"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiering pågår"
@@ -342,7 +442,23 @@ msgstr "trevligt"
 msgid "maybe"
 msgstr "tveksamt"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Hämtar paket-information från XML meta-data..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Ingen xml-info för media \"%s\", endast partiellt resultat för paket %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Ingen beskrivning"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -351,66 +467,76 @@ msgstr ""
 "Vissa paket som krävs av %s kan inte installeras:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Ett fel inträffade:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Ett allvarligt fel inträffade: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Fråga inte igen"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installationstransaktioner misslyckades"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installation av paket misslyckades:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Arbetsstation"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontorsarbetsstation"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Kontorsprogram: ordbehandlare (OpenOffice.org Writer, Kword), kalkylprogram "
-"(OpenOffice.org Calc, Kspread), PDF-visare, etc"
+"Kontorsprogram: ordbehandlare (LibreOffice Writer, Kword), kalkylprogram "
+"(LibreOffice Calc, Kspread), PDF-visare, etc"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Spelstation"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Underhållande program: arkad, brädspel, strategi, etc"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediastation"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Redigerings- och uppspelningsprogram för video och ljud"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internetstation"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -419,193 +545,193 @@ msgstr ""
 "En samling verktyg för att läsa och skicka e-post och nyheter (mutt, tin...) "
 "och för att utforska Internet"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Nätverksdator (klient)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
-msgstr "Klienter för olika protokoll inkluderande SSH"
+msgstr "Klienter för olika protokoll inklusive SSH"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Verktyg för att underlätta konfigurationen av datorn"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsollverktyg"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Editorer, skal, filverktyg, terminaler"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Utveckling"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Utvecklingsbibliotek, program och include-filer för C och C++"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Böcker och \"Howto's\" om Linux och fri mjukvara"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Stöd för tredjepartsprogram"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Webbserver"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Brandvägg/Router"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet-gateway"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "E-post/Nyheter"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "E-postservern Postfix, Nyhetsgruppservern Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Katalog-server"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-server"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domännamnserver och Nätverksinformationsserver"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Fil och Skrivarserver"
+msgstr "Fil och skrivarserver"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
-msgstr "NFS-server, Samba-server"
+msgstr "NFS och Samba-server"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Databas"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL- och MySQL-databasserver"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL- och MariaDB-databasserver"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Webb/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "E-postservern Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL- eller MySQL-databasserver"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL- eller MariaDB-databasserver"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Nätverksserver"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-server, SMB-server, Proxyserver, SSH-server"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafisk miljö"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbetsstation"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -614,12 +740,12 @@ msgstr ""
 "K Desktop Environment, den grundläggande grafiska miljön med en samling "
 "tillhörande verktyg"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome-arbetsstation"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -627,66 +753,125 @@ msgid ""
 msgstr ""
 "Grafisk miljö med en samling användarvänliga program och skrivbordsverktyg"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "XFCE-arbetsstation"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"En lättare grafisk miljö med en användarvänlig uppsättning av program och "
+"skrivbordsverktyg"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "MATE-arbetsstation"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Cinnamon-arbetsstation"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "En grafisk miljö baserad på GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Skrivbordet LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "En nästa generations QT-portering av den lätta skrivbordsmiljön"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Enlightenment e17-skrivbord"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "En lättviktig snabb grafisk miljö med ett dedikerat efterföljande"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE Skrivborsmiljö"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "En lätt och snabb grafisk miljö"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasmaskrivbord"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"En lätt & snabb grafisk miljö med en samling användarvänliga program och "
-"skrivbordsverktyg"
+"Plasmaskrivbordet. En grundläggande grafisk miljö med en samling av "
+"medföljande verktyg."
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andra grafiska skrivbordsmiljöer"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, mfl."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Verktyg"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-server"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Fjärrkonfigurationsserver"
+msgstr "Fjärrkonfiguration med Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Nätverksverktyg/Övervakning"
+msgstr "Nätverksverktyg/övervakning"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
-msgstr "Övervakningsverkty, processhantering, tcpdump, nmap, ..."
+msgstr "Övervakningsverktyg, processhantering, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
-msgstr "Mageia Guider"
+msgstr "Mageiaguider"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Guider för att konfigurera servern"
@@ -698,9 +883,10 @@ msgid ""
 "Continue at your own risk."
 msgstr ""
 "Ett fel uppstod och jag vet inte hur det kan hanteras på ett\n"
-"bra sätt. Fortsätt på egen risk."
+"bra sätt.\n"
+"Fortsätt på egen risk."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -711,7 +897,7 @@ msgstr ""
 "NÃ¥gra viktiga paket blev inte installerade ordentligt.\n"
 "Antingen är cd-enheten eller cd-skivan trasig.\n"
 "Du kan kontrollera cd-skivan på en redan installerad\n"
-"Mageia Linux-dator med kommandot \"rpm -qpl media/main/*.rpm\".\n"
+"Mageia-dator med kommandot \"rpm -qpl media/main/*.rpm\".\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
@@ -720,340 +906,340 @@ msgstr "Påbörjar steg \"%s\"\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux installation %s"
+msgid "%s Installation %s"
+msgstr "%s installation %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> mellan element"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg server är långsam i starten. Vänta..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Systemet har ont om resurser. Du kan få problem med att installera\n"
-"Mageia Linux. Om det blir problem kan du prova den textbaserade\n"
+"%s. Om det blir problem kan du prova den textbaserade\n"
 "installationen istället. För att göra det tryck F1 när du startar\n"
 "från cd-skivan, skriv sedan \"text\"."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Installera Mageia KDE Skrivbordsmiljö"
+msgid "Media Selection"
+msgstr "Val av media"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Installera Mageia GNOME Skrivbordsmiljö"
+msgid "Install %s KDE Desktop"
+msgstr "Installera %s KDE Skrivbordsmiljö"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "Installera %s GNOME Skrivbordsmiljö"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Anpassad installation"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE Skrivborsmiljö"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME Skrivborsmiljö"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Anpassad Skrivborsmiljö"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
-msgstr "Här är en demo av '%s' skrivbord."
+msgstr "Här är en förhandsvisning av '%s' skrivbord."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
-msgstr "Klicka på bilderna för att se en större demo"
+msgstr "Klicka på bilderna för att se en större förhandsvisning"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Val av paketgrupper"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Välj enskilda paket"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Total storlek: %d / %d MB"
+msgid "Unselect All"
+msgstr "Avmarkera alla"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Ogiltigt paket"
+msgid "Total size: %d / %d MB"
+msgstr "Total storlek: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Version: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Storlek: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Betydelsegrad: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
-msgstr "Du kan inte välja/välja bort detta paket."
+msgid "You cannot select/unselect this package"
+msgstr "Du kan inte välja/välja bort det här paketet."
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
-msgstr "pga saknande %s"
+msgstr "p.g.a. saknande %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "på grund av otillräckliga %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "försöker befordra %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "för att behålla %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
-"Du kan inte välja detta paket eftersom det inte finns tillräckligt med "
-"utrymme."
+"Du kan inte välja det här paketet eftersom det inte finns tillräckligt med "
+"ledigt utrymme."
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Följande paket kommer att installeras"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Följande paket kommer att tas bort"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
-msgstr "Detta är ett obligatoriskt paket som inte kan väljas bort."
+msgid "This is a mandatory package, it cannot be unselected"
+msgstr "Det här är ett obligatoriskt paket som inte kan väljas bort."
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
-msgstr "Du kan inte välja bort detta paket. Det är redan installerat."
+msgid "You cannot unselect this package. It is already installed"
+msgstr "Du kan inte välja bort det här paketet. Det är redan installerat."
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Du kan inte välja bort det här paketet. Det måste uppdateras."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Visa automatiskt valda paket"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Installera"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
-msgstr "Ladda/Spara markering"
+msgstr "Ladda/spara val"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Uppdaterar paketval"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal installation"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Programhantering"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
-msgstr "Välj paketen som du vill installera"
+msgstr "Välj de paket som du vill installera"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installerar"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Inga detaljer"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Återstående tid:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(uppskattar...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d paketet"
 msgstr[1] "%d paket"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Sammanfattning"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Konfigurera"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "Inte inställt"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Val av medium"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 "Följande installationskällor har hittats.\n"
-"Du kan välja bort dom du inte önskar använda dig av."
+"Du kan välja bort de du inte vill använda dig av."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
-"Du har möjligheten att kopiera innehållet på CDn till hårddisk innan "
-"installationen.\n"
-"Installationen kommer att fortsätta från hårddisken och paketen kommer att "
-"fortsätta vara tillgängliga när systemet är färdiginstallerat."
+"Du har möjlighet att kopiera innehållet från CDn till hårddisken innan "
+"installationen påbörjas.\n"
+"Installationen kommer sedan att fortsätta från hårddisken och paketen kommer "
+"fortsättningsvis att vara tillgängliga när systemet är färdiginstallerat."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
-msgstr "Kopiera hela CD skivor"
+msgstr "Kopiera hela CD-skivor"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Ett fel inträffade"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Välj tangentbordslayout"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Här är hela listan med tillgängliga tangentbord:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
-msgstr "Installera/Uppdatera"
+msgstr "Installera/Uppgradera"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "Är detta en installation eller en uppdatering?"
+msgstr "Är det här en installation eller en uppgradering?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installera"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
-msgstr "Uppdatera %s"
+msgstr "Uppgradera %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Krypteringsnyckel för %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
-msgstr "Avbryt installation, starta om systemet"
+msgstr "Avbryt installationen, starta om systemet"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Ny installation"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Uppgradera tidigare installation (rekommenderas ej)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1061,44 +1247,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Installationsprogrammet har märkt att ditt installerade Mageia Linux\n"
+"Installationsprogrammet har märkt att ditt installerade Linux\n"
 "system inte kan uppgraderas på ett säkert sätt till %s.\n"
 "\n"
-"En nu installation som ersätter din tidigare rekommenderas.\n"
+"En ny installation som ersätter din tidigare rekommenderas.\n"
 "\n"
-"Varning: du bör säkerhetskopiera alla dina personliga filer förrän du\n"
+"Varning: Du bör säkerhetskopiera alla dina personliga filer innan du\n"
 "väljer \"Ny installation\"."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Konfigurerar IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Inget ledigt utrymme för 1MB bootstrap. Installationen fortsätter, men för "
-"att starta systemet måste du skapa en \"bootstrap\"-partition i Diskdrake."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Du måste skapa en PPC PRep Bootstrap. Installationen fortsätter, men för att "
-"starta systemet måste du skapa \"bootstrap\"-partitionen i Diskdrake."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1106,18 +1273,18 @@ msgid ""
 "done.\n"
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
-"Byt cd-skiva.\n"
+"Byt CD-skiva.\n"
 "\n"
-"Sätt in cd-skivan med namn \"%s\" och klicka på OK.\n"
+"Sätt i CD-skivan med namn \"%s\" och klicka på OK.\n"
 "Om du inte har den, klicka på Avbryt för att hoppa över\n"
 "den delen av installationen."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Söker efter tillgängliga paket..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1126,7 +1293,7 @@ msgstr ""
 "Ditt system har inte tillräckligt med utrymme kvar för installation eller "
 "uppgradering (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1135,141 +1302,168 @@ msgstr ""
 "Välj ladda eller spara paketval.\n"
 "Formatet är detsamma som för auto_install-genererade filer."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Inläsning"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Spara"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Oanvändbar fil"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Val av skrivbord"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Du kan väja din arbetsstationsprofil."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Vald storlek är större än tillgängligt utrymme."
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Installationstyp"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 "Du har inte valt några gruppaket.\n"
-"Välj den minimala installationen du vill ha:"
+"Välj en minimal installation som du vill ha:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "Installera föreslagna paket"
+msgid "Install recommended packages"
+msgstr "Installera rekommenderade paket"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med grundläggande dokumentation (rekommenderas)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Minimal installation (ingen urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Förbereder uppgradering..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Förbereder installation"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerar paket %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Det uppstod ett fel vid sortering av paket:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Fortsätta ändå?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Försök igen"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
-msgstr "Hoppa över detta paket"
+msgstr "Hoppa över det här paketet"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Hoppa över alla paket från mediet \"%s\""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "GÃ¥ tillbaka till media och paketval"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Det uppstod ett fel vid installation av paketet %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Bearbetar installerade paket"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Kontrollera att media för uppdateringsmoduler finns i enhet %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Uppdateringar"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Du har nu möjlighet att ange online-media"
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Med det här kan du installera säkerhetsuppdateringar."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"För att ange dessa media behöver du en fungerande internetanslutning.\n"
+"\n"
+"Vill du ange uppdateringsmedia?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1281,8 +1475,9 @@ msgid ""
 "\n"
 "Do you want to install the updates?"
 msgstr ""
-"Nu har du möjlighet att ladda hem programuppdateringar. Dessa\n"
-"paket har kommit ut efter att denna distribution släppts. De kan\n"
+"Du har nu möjlighet att ladda hem programuppdateringar. De här\n"
+"paketen\n"
+"har utkommit efter att denna distributionen släpptes. De kan\n"
 "innehålla säkerhetsuppdateringar eller felrättningar.\n"
 "\n"
 "Du behöver en fungerande Internetanslutning för att kunna ladda ner dessa "
@@ -1290,28 +1485,29 @@ msgstr ""
 "\n"
 "Vill du installera uppdateringarna?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "HÃ¥rdvara"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Ljudkort"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du ett ISA-ljudkort?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1320,99 +1516,87 @@ msgstr ""
 "Kör \"alsaconf\" eller \"sndconfig\" efter installationen för att "
 "konfigurera ljudkortet."
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Inget ljudkort hittades. Prova \"harddrake\" efter installationen."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafiskt gränssnitt"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Nätverk & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxyservrar"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "konfigurerad"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Säkerhetsnivå:"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Brandvägg"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "aktiverad"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Du har inte konfigurerat X. Är du säker på att du vill göra detta?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Förbereder starthanterare..."
+msgid "Preparing initial startup program..."
+msgstr "Förbereder initiellt uppstartsprogram..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Ha tålamod, detta kan ta en stund..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Du verkar ha en OldWorld eller okän maskin, yaboot-starthanteraren kommer "
-"inte att fungera Installationen fortsätter, men du behöver använda BootX "
-"eller något liknande för att starta datorn. Kernelargumentet för roten är "
-"root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
-"På den här säkerhetsnivån är tillgång till Windowspartitionen förbehållen "
+"På den här säkerhetsnivån är tillgång till Windowspartitionen begränsad till "
 "administratören."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
-msgstr "Sätt in en tom diskett i diskettenhet %s"
+msgstr "Sätt in en tom diskett i enhet %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Skapar automatisk installationsdiskett"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1423,12 +1607,12 @@ msgstr ""
 "\n"
 "Vill du verkligen avbryta nu?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
-msgstr "Gratulerar"
+msgstr "Grattis"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Starta om"
@@ -1523,13 +1707,6 @@ msgid ""
 "Users"
 msgstr "Användare"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Nätverk"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1571,110 +1748,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Avsluta"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Kontorsprogram: ordbehandlare (Kword, Abiword), kalkylprogram (Kspread, "
-#~ "Gnumeric), PDF-visare, etc"
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Du har valt att uppgradera ditt system till %s. KDE 3.5 har hittats på "
-#~ "ditt\n"
-#~ "system. Detta installationsprogram kan inte behålla KDE 3.5 vid en "
-#~ "uppgradering.\n"
-#~ "Om du väljer att fortsätta, kommer KDE 4 att ersätta KDE 3, och du kommer "
-#~ "att\n"
-#~ "förlora dina personliga inställningar.\n"
-#~ "För att uppgradera med KDE 3.5 och behålla dina personliga inställningar, "
-#~ "var\n"
-#~ "vänlig och starta om ditt system och uppgradera med Mandriva "
-#~ "uppdateringsprogram."
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Laddar ner filen %s..."
-
-#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-#~ msgstr "Uppgradering från en 32bit till en 64bit distribution stöds inte."
-
-#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-#~ msgstr "Uppgradering från en 64bit till en 32bit distribution stöds inte."
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Du har valt följande server/servrar: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Dessa servrar aktiveras som standard. De har inga kända "
-#~ "säkerhetsproblem,\n"
-#~ "men sådana kan upptäckas. Om så blir fallet måste du se till att "
-#~ "uppdatera\n"
-#~ "dem så snabbt som möjligt.\n"
-#~ "\n"
-#~ "\n"
-#~ "Vill du verkligen installera dessa servrar?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "IceWm Skrivborsmiljö"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr ""
-#~ "Kontaktar webbplatsen för att hämta en lista över tillgängliga paket..."
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Kan inte kontakta spegeln %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Genererar automatisk installationsdiskett"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "Automatisk installation kan göras helt automatisk, om så önskas,\n"
-#~ "vilket gör att den tar över hårddisken\n"
-#~ "(syftet är att installera på en annan dator).\n"
-#~ "\n"
-#~ "Du kan tänkas vilja köra samma installation i repris.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Repris"
-
-#~ msgid "Automated"
-#~ msgstr "Automatiserad"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Spara paketval"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Vill du använda aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Fel vid installationen av aboot.\n"
-#~ "Vill du försöka ändå, fast det kan förstöra den första partitionen?"
diff --git a/perl-install/install/share/po/ta.po b/perl-install/install/share/po/ta.po
index 58bf8a873..a0db1278c 100644
--- a/perl-install/install/share/po/ta.po
+++ b/perl-install/install/share/po/ta.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2002-09-06 00:35+0800\n"
 "Last-Translator: prabu anand <prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
@@ -20,38 +20,63 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "அல�வல� கர�விகள�"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "For developers!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Thank you!"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
 msgstr "மேல�ம�  உள�ளனவா?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -60,112 +85,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "சிடி இயக�கி"
 
-#: any.pm:121
+#: any.pm:163
 #, fuzzy, c-format
 msgid "Network (HTTP)"
 msgstr "வலையமைப�ப� %s"
 
-#: any.pm:122
+#: any.pm:164
 #, fuzzy, c-format
 msgid "Network (FTP)"
 msgstr "வலையமைப�ப� %s"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
-#, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+#: any.pm:248
+#, fuzzy, c-format
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "தற�ேபாத�ள�ள இணைப� பதிப�ப�தளங�களை அறிய மாண�ட�ேரக� இணையதளம� தொடர�ப�கொள�ளப�பட�கிறத�"
 
-#: any.pm:187
+#: any.pm:253
 #, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr "தற�ேபாத�ள�ள இணைப� பதிப�ப�தளங�களை அறிய மாண�ட�ேரக� இணையதளம� தொடர�ப�கொள�ளப�பட�கிறத�"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "பொதிகளை எங�கிர�ந�த� இறக�க விர�ம�ப�கிறீர�கள�"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "அடைவ�"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "இதை திறக�க ம�டியவில�ைல%s: %s\n"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "�ற�கனவே நிற�வப�பட�ட�ள�ள பொதிகள� பார�ைவயிடப�பட�கின�றன"
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "மேம�பட�த�தப�பட வேண�டிய பொதிகள� அறியப�பட�கின�றன"
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -174,87 +264,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s என�ற கோப�ேபா படிப�பதில� பிழை நேர�ந�த�ள�ளத�"
 
-#: any.pm:1020
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "கிழ�கான�ம� பொதிகள� நிற�வ�வதற�க� தேர�வ�ச� செய�யப�பட�ட�ள�ளத�"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "வலையமைப�ப�"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "தயவ�செய�த� ேதர�ந�ெதட�க�கவ�ம�"
 
-#: any.pm:1118
+#: any.pm:1402
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "இந�த கோப�ப� �ற�கனவே உள�ளத�. பயன�பாட�த�தி கொள�ளலாமா?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, fuzzy, c-format
 msgid "Permission denied"
 msgstr "அன�மதிகள�"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "கெட�ட தகவல�"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "வகிர�தல� ம�டிவதற�க� ம�ன� திரைவேட�ட� எட�க�க ம�டியாத�"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "நிற�வி ம�டித�தவ�டன� திரைவேட�ட�கள� %s என�ற அடைவில� கிடைக�க�ம�"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "நிற�வப�பட�கிறத�"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "வடிவமைப�ப�கள�"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "நீங�கள� %s இதனைய�ம� வடிவ�ட�ட வேண�ட�ம�"
@@ -278,22 +368,22 @@ msgstr "வலையமைபà¯�பாகà¯�கஙà¯�களà¯� à®�à®±à¯�றபà¯
 msgid "Bringing down the network"
 msgstr "வலையமைப�பாக�கங�கள� ம�டக�கப�பட�கிறத�"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "இன�ன�ம� தேட�தல� நடைபெற�கிறத�"
@@ -323,340 +413,422 @@ msgstr "அழகானவை"
 msgid "maybe"
 msgstr "தேவைப�பட�டால�"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "இவரிக�க வில�லை"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "பிழை நேர�ந�த�ள�ளத� மன�னிக�கவ�ம�"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "நிற�வ�தலில� பிழை நேர�ந�த�ள�ளத�"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "%s பொதி நிற�வப�பட�கிறத�"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "வேலைக�களம�"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "அல�வல� கர�விகள�"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, fuzzy, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"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:26
 #, c-format
 msgid "Game station"
 msgstr "விளையாட�ட�கள�"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "விளையாட�ட�கள�"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "பல�லூடக கணினி"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "பல�லூடக இயக�கிகள�/உர�வாக�க நிரல�கள�"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "இணையக� கணினி"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, fuzzy, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "நீங�கள� மின�னஞ�சல�, மற�ற�ம� இணையத�ைத மேலோட உதவ�ங�கர�விகள�"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "வலையமைப�ப�க� கணினி(வேண�டி)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "ssh ம�தலிய வலையமைப�ப�க� கர�விகள�"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "உங�கள� கணினியை எளிதாக வடிவமைக�க உதவ�ங�கர�விகள�"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "ம�னையக� கர�விகள�"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "உர�வாக�கம�"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "உதவிநூல�"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "LSB- லினக�ஸ� தரக�கட�ட�ப�பாட�ட�க�க� தேவையான நிரல�கள�."
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "இணையத�தள சேவையகம�"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, fuzzy, c-format
 msgid "Groupware"
 msgstr "கிரப�"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "கோலாப� சேவகன�"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "நெர�ப�ப�ச�ச�வர�/வழிப�பட�த�தி"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "இணைய ந�ழைவாயில�"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/கோப�ப�/_ப�தியத�"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "மின�னஞ�சல� பரிமாறி"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "RAID இர�ந�த� நீக�க�"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, fuzzy, c-format
 msgid "FTP Server"
 msgstr "NTP சேவையகம�"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS "
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "அச�ச�ப�ெபாறி சேவையகம�"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "தரவ�தளங�கள�"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, fuzzy, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL/MySQL தரவ�த�தள பரிமாறிகள�"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL/MariaDB தரவ�த�தள பரிமாறிகள�"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "இணையதள/கோப�ப�ப� பாிமாற�றம�"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "அப�பாச�சி, ftpd போன�ற பரிமாற�ற� நிரல�கள�"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "மின�னஞ�சல�"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, fuzzy, c-format
 msgid "Postfix mail server"
 msgstr "மின�னஞ�சல� பரிமாறி"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL/MySQL தரவ�த�தள பரிமாறிகள�"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL/MariaDB தரவ�த�தள பரிமாறிகள�"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "வலையமைப�பக பரிமாறி"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS /சம�பா/பினாமி/ssh பரிமாறிகள�"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "வரைவியல�வழி சூழல�கள�"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Kசாளரமைப�ப� பணிக�கணினி"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "க�ேனாம� பணிக�கணினி"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, 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:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "Kசாளரமைப�ப� பணிக�கணினி"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr "ஓர� பயன�பட�த�த�வதற�க� எளிதான வரைவியல�வழி  மேலாளர�"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "க�ேனாம� பணிக�கணினி"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "வேலைக�களம�"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "வரைவியல�வழி சூழல�கள�"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "மேசைசெயலி"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "ஓர� பயன�பட�த�த�வதற�க� எளிதான வரைவியல�வழி  மேலாளர�"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "மேசைசெயலி"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr "ஓர� பயன�பட�த�த�வதற�க� எளிதான வரைவியல�வழி  மேலாளர�"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "மேசைசெயலி"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "Kசாளரமைப�ப�-  ஓர� பயன�பட�த�த�வதற�க� எளிதான வரைவியல�வழி  மேலாளர�"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "மற�ற வரைவியல�வழி  மேலாளர�கள�"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, fuzzy, 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:223
 #, c-format
 msgid "Utilities"
 msgstr "உதவிக�கர�விகள�"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, fuzzy, c-format
 msgid "SSH Server"
 msgstr "சேவையகம�"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "வலைபடக� கர�வி"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "பரிமாறி வடிவமைப�ப�"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "வலையமைப�பாக�க  வடிவமைப�ப� "
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "மாண�ட�ேரக� கட�ட�ப�பட�ட� மையம�"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "அச�ச�ப�ெபாறி  \"%s\" வடிவமைப�ப� ெவற�றியடையவில�ைல"
@@ -670,7 +842,7 @@ msgstr ""
 "பிழை நேர�ந�த�ள�ளத� மன�னிக�கவ�ம� எனக�க� என�ன செய�வதென�ற� தெரியவில�ைல\n"
 "தொடர�ந�த� செல�வத� உங�கள� பொற�ப�ப�"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -689,8 +861,8 @@ msgid "Entering step `%s'\n"
 msgstr "தற�ேபாத� இந�த  `%s நிலைக�க� செல�கிறோம�' \n"
 
 #: steps_curses.pm:22
-#, c-format
-msgid "Mageia Linux Installation %s"
+#, fuzzy, c-format
+msgid "%s Installation %s"
 msgstr "மாண�ட�ேரக� லினக�ஸ� நிற�வல�  %s"
 
 #: steps_curses.pm:32
@@ -698,323 +870,323 @@ msgstr "மாணà¯�டà¯�ேரகà¯� லினகà¯�ஸà¯� நிறà¯�வலà
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr ""
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
-#, c-format
+#: steps_gtk.pm:212
+#, fuzzy, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "உங�கள� கணினியில� வளங�கள� க�றைவாக உள�ளதால�\n"
 "மாண�ட�ேரக� லினக�ஸ� நிற�வ�வதில� பிழை �ற�படலாம�. நீங�கள� உரைவழி நிற�வலாம�,\n"
 "சிடியில� நிற�வ தொடங�க�ம� போத�  `F1'  என அழ�த�தி விட�ட�,  `text'. என அடிக�கவ�ம�"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "பொதிகள� க�ழ�த� தேர�வ�"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "க�றைந�தபட�ச நிற�வல�"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "மேசைசெயலி"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "மேசைசெயலி"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "மேசைசெயலி"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "பொதிகள� க�ழ�த� தேர�வ�"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "தனித�னி பொதியாக தேர�வ�ச� செய�"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "மெகா பைட�டில� மொத�த அளவ�  %d / %d"
+msgid "Unselect All"
+msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "தவறான பொதி"
+msgid "Total size: %d / %d MB"
+msgstr "மெகா பைட�டில� மொத�த அளவ�  %d / %d"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "வெளியீட�: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "அளவ�: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, fuzzy, c-format
 msgid "%d KB\n"
 msgstr "கிலோ பைட�டில� அளவ�  %d \n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "ம�க�கியத�த�வம�: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "நீங�கள� இந�த பொதியை தேர�வ�/நீக�க ம�டியாத�"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "kdesu இல�ைல"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "இடமில�ைல என�பதால�  நீங�கள� இந�த பொதியைத� தே`ர�வ�ச� செய�ய ம�டியாத�"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "கிழ�கான�ம� பொதிகள� நிற�வ�வதற�க� தேர�வ�ச� செய�யப�பட�ட�ள�ளத�"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "கிழ�கான�ம� பொதிகள� நீக�கப�பட�கிறத�"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "இத� கட�டாய பொதி. இதனை நீக�க ம�டியாத�"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "இந�த பொதியை.நீக�க ம�டியாத�. இத� �ற�கனவே நிற�வப�பட�டள�ளத�"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "இந�த பொதியை.நீக�க ம�டியாத�. இத� நிகழ�நிலைப�பட�த�த வேண�டிய பொதி"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "தானாக தேர�வ�ச� செய�யப�பட�ட�ள�ள பொதிகளைக� காட�ட�"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "நிற�வ�"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "பொதிகள� தேர�வ�"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "பொதிகள� தேர�ைவ நிகழ�நிலைப� பட�த�த�"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "க�றைந�தபட�ச நிற�வல�"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "நிரல� மேலாண�மை"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "நிற�வ வேண�டிய பொதிகளை தேர�வ�ச� செய�ய�ங�கள� "
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "நிற�வப�பட�கிறத�"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, fuzzy, c-format
 msgid "No details"
 msgstr "விவரங�கள�"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "தேவைப�பட�ம� நேரம�"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "கணக�கிடப�பட�கிறத�"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d பொதிகள�"
 msgstr[1] "%d பொதிகள�"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "உரை"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "வடிவமை"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "வடிவமைக�கப�படவில�ைல"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "பொதிகள� க�ழ�த� தேர�வ�"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "பிழை நேர�ந�த�ள�ளத� மன�னிக�கவ�ம�"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "தயவ�செய�த� உங�கள� விசைப�பலகை இட அமைவைத� தேர�வ� செய�க "
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "உங�கள� பயன�பாட�டிற�க� உள�ள விசைப�பலகைகள� அனைத�த�ம� இங�கே கொட�க�கப�பட�ட�ள�ளன"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "நிற�வ�த�ல�/ேமம�பட�த�தல�"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "இத� நிற�வ�தலா அல�லத� ேமம�பட�த�தலா?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "நிற�வ�"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr " %s ேமம�பட�த�த�"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, fuzzy, c-format
 msgid "Encryption key for %s"
 msgstr "மறைக�க�றியீட�ட�ச� சாவி"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "நிற�வப�பட�கிறத�"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1023,36 +1195,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE  வடிவமைக�கப�பட�கிறத�..."
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"த�வங�க�நிரலை நிற�வ இடமில�ைல. நிற�வ�தல� தொடர�ம�. ஆனால� உங�கள� லினக�ஸ� இயக�க நிரலை த�வக�க "
-"டிரேக�வட�ைட பயன�பட�த�த�ங�கள�"
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"த�வங�க�நிரலை நிற�வ இடமில�ைல. நிற�வ�தல� தொடர�ம�. ஆனால� உங�கள� லினக�ஸ� இயக�க நிரலை த�வக�க "
-"டிரேக�வட�ைட பயன�பட�த�த�ங�கள�"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1067,19 +1220,19 @@ msgstr ""
 "இந�த சிடி இல�ைலயென�றால� நீக�க� என�ற பொத�தானை கிளிக� செய�தால� இந�த சிடியிலிர�ந�த� நிற�வல� "
 "நின�ற�விட�ம�"
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "இர�க�க�ம� பொதிகள� பார�ைவயிடப�பட�கின�றன"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1088,52 +1241,52 @@ msgstr ""
 "தயவ�செய�த� உங�கள� பொதி தேர�ைவ ஒர� நெகிழ�வட�டில� சேமிக�கவ�ம�.\n"
 "இவ�வாற� சேமிக�க�ம� ம�றை தானியங�கி-நிற�வலை ஒத�த� இர�க�க�ம�"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "�ற�றி"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "சேமி"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "கோப�பை �ற�ற�"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "Kசாளரமைப�ப�"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "க�னோம�"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "பொதிகள� க�ழ�த� தேர�வ�"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "நீங�கள� தேர�வ� செய�த�ள�ள அளவ�, இர�க�க�மிடத�ைத விட அதிகமாக உள�ளத�"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "நிற�வல� ம�றை"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1142,87 +1295,111 @@ msgstr ""
 "நீங�கள� பொதி க�ழ�க�கள� எதனைய�ம� தேர�வ� செய�யவில�ைல.\n"
 "தயவ�செய�த� உங�கள�க�க� தேவையானதை தேர�வ� செய�யவ�ம�"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X உடன� வரைவியல�வழியிடல பயன�பட�த�த இத� தேவை"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "%s பொதி நிற�வப�பட�கிறத�"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "உதவி நூல�கள�டன� (க�றைந�தபட�சம� இத� தேவை!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "மிகச�சிறிய நிற�வல�(urpmi கூட கிடையாத�)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "த�வங�க�நிரலை உர�வாக�க�கிறேன�..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "நிற�வ�தல� தொடங�க�கிறத�"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s பொதி நிற�வப�பட�கிறத�"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "பொதிகளை அட�க�க�வதில� பிழை நேர�ந�த�ள�ளத�"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "தொடர�ந�த� செல�லலாமா?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "மீளச�செய�"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "பொதித� தேர�ைவச� சேமி"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "பொதிகளை நிற�வ�வதில� பிழை நேர�ந�த�ள�ளத�"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "நிற�வியபின� சேய�ய வேண�டிய வடிவமைப�ப�கள�"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "ப�த�ப�பித�தல�கள�"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1242,122 +1419,115 @@ msgstr ""
 "\n"
 "இவற�ைற நிற�வ விர�ப�பமா ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s இல� %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "வன�பொர�ள�"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "ஒலியட�ைட"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "உங�களிடம� ISA ஒலியட�ைட �தேன�ம� உள�ளனவா?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, fuzzy, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "\"sndconfig\" என�ற நிரல� மூலம� உங�கள� ஒலியட�ைடயை வடிவமைக�க ம�டிய�ம�"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "ஒலியட�ைட �த�ம� கண�ட�பிடிக�க ம�டியவில�ைல. டிரேக�வன�ெபார�ள� மாயாவியை பயன�பட�த�த�ங�கள�"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "வரைவியல�வழி"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "வலையமைப�ப�ம� இணையம�ம�"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, fuzzy, c-format
 msgid "Proxies"
 msgstr "பயனர�க�றிப�ப�: "
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, fuzzy, c-format
 msgid "configured"
 msgstr "மற�வடிவமை"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "பாத�காப�ப� நிலை"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "நெர�ப�ப�ச�ச�வர�"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, fuzzy, c-format
 msgid "activated"
 msgstr "இப�போத� த�வக�க�"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "ம�டமாக�கப�பட�ட�ள�ளத�"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "த�வங�க�நிரலை உர�வாக�க�கிறேன�..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "நிற�வ�தல� தொடங�க�கிறத�"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, fuzzy, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr "தயவ�செய�த� நிற�வ�வதற�க� ஆங�கிலத�ைத பயன�பட�த�த�ங�கள�"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "வெற�ற� நெகிழ�வட�ைட  %s இயக�கியில� உள�ளிடவ�ம�"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "தானியங�கி நிற�வல�வட�ைட உர�வாக�கவ�ம�"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1368,12 +1538,12 @@ msgstr ""
 "\n"
 "நீங�கள� நிச�சயம� நிற�வ�தலை விட�ட� வெளியேற விர�ம�ப�கிறீர�களா?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "வாழ�த�த�க�கள�"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "மற�ெதாடக�கம�"
@@ -1468,13 +1638,6 @@ msgid ""
 "Users"
 msgstr "பயனர�கள�"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "வலையமைப�ப�"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1517,6 +1680,58 @@ msgid ""
 "Exit"
 msgstr "வெளிச�ெசல�"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "த�வங�க�நிரலை உர�வாக�க�கிறேன�..."
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr "ஓர� பயன�பட�த�த�வதற�க� எளிதான வரைவியல�வழி  மேலாளர�"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "மேசைசெயலி"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "த�வங�க�நிரலை நிற�வ இடமில�ைல. நிற�வ�தல� தொடர�ம�. ஆனால� உங�கள� லினக�ஸ� இயக�க நிரலை "
+#~ "த�வக�க டிரேக�வட�ைட பயன�பட�த�த�ங�கள�"
+
+#, fuzzy
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "த�வங�க�நிரலை நிற�வ இடமில�ைல. நிற�வ�தல� தொடர�ம�. ஆனால� உங�கள� லினக�ஸ� இயக�க நிரலை "
+#~ "த�வக�க டிரேக�வட�ைட பயன�பட�த�த�ங�கள�"
+
+#, fuzzy
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr "தயவ�செய�த� நிற�வ�வதற�க� ஆங�கிலத�ைத பயன�பட�த�த�ங�கள�"
+
+#~ msgid "Welcome"
+#~ msgstr "வர�க"
+
+#~ msgid "Bad package"
+#~ msgstr "தவறான பொதி"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "த�வங�க�நிரலை உர�வாக�க�கிறேன�..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "வலையமைப�ப�"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1563,7 +1778,7 @@ msgstr "வெளிச�ெசல�"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/tg.po b/perl-install/install/share/po/tg.po
index 6a8a08ac7..c225cc14a 100644
--- a/perl-install/install/share/po/tg.po
+++ b/perl-install/install/share/po/tg.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2005-09-17 16:03+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -26,38 +26,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "И�тгоҳи Кории Идораӣ"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Thank you!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Be Free!"
 msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Шумо боз дигар ра�онаи иловагиро доред?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -66,117 +91,182 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Шабака (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Шабака (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Шабакаи (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL-и оина?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Барои ба да�т даровардани рӯйхати қуттиҳои да�тра� пайва�тшавӣ ба Mageia "
+"Барои ба да�т даровардани рӯйхати қуттиҳои да�тра� пайва�тшавӣ ба %s "
 "Linuxweb site ба роҳ монда шудаа�т..."
 
-#: any.pm:187
+#: any.pm:253
 #, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Барои ба да�т даровардани рӯйхати қуттиҳои да�тра� пайва�тшавӣ ба Mageia "
+"Барои ба да�т даровардани рӯйхати қуттиҳои да�тра� пайва�тшавӣ ба %s "
 "Linuxweb site ба роҳ монда шудаа�т..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Оинаро интихоб намоед, ки аз он қуттиҳоро гирифта мешавад"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Танзими NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Феҳри�т"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Пайдо кардани файли hdlist дар ин оина нашуда и�тодаа�т."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr ""
 "Ҷу�туҷи ба�таи барномаҳои аллакай коргузорӣ шуда иҷро шуда и�тодаа�т..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Ҷу�туҷӯи қуттиҳо барои нав намудан иҷро мешавад..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -190,87 +280,87 @@ msgstr ""
 "\n"
 "Дар ҳақиқат мехоҳед, ки ин ба�таи барномаҳоро хориҷ кунед?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Хатогӣ ҳангоми хониши файл %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "- %s хориҷ карда шуд\n"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Шабака"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Илтимо� интихоб кунед"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Файл аллакай вуҷуд дорад. И�тифода барем?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Рух�ат инкор шуд"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "миёнаи иловашуда %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Сохтани �кранак�ҳо пеш аз тақ�имкунӣ номумкин"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Экран�к�ҳо баъд аз коргузориш дар %s да�тра� мешаванд"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "Коргузорӣ шуда и�тодаа�т"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Батанзимдарорӣ"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Шумо бо�д %s-ро шаклбандӣ намоед"
@@ -295,22 +385,22 @@ msgstr "Шабака оварда мешавад"
 msgid "Bringing down the network"
 msgstr "Шабака фаромада и�тодаа�т"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Муа�йнкунӣ дар раванди иҷроиш қарор дорад"
@@ -340,74 +430,98 @@ msgstr "хуб"
 msgid "maybe"
 msgstr "мумкин а�т"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Бе тав�ифҳо"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Хатогӣ рух дод"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Хатогии ҷиддӣ рӯй дод: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d коргузорӣ амалӣ нагардид"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Интихоби �инфи коргузорӣ"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "И�тгоҳи корӣ"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "И�тгоҳи Кории Идораӣ"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Барномаҳои идорӣ: пардозандаҳои матнӣ (OpenOffice.org Writer, Kword), "
-"ҷадвалҳои гу�турда (OpenOffice.org Calc, Kspread), азназаргузарҳои PDF ва "
-"ғайра"
+"Барномаҳои идорӣ: пардозандаҳои матнӣ (LibreOffice Writer, Kword), ҷадвалҳои "
+"гу�турда (LibreOffice Calc, Kspread), азназаргузарҳои PDF ва ғайра"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "И�тгоҳи бозӣ"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Барномаҳои шавқовар: аркадаҳо, бозиҳои рӯи мизӣ, �тратеги� ва ғайра"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "И�тгоҳи би�ёрмуҳита"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Барномаҳо барои бозикунии/таҳрири овоз ва видео"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "И�тгоҳи Интернет"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -416,193 +530,193 @@ msgstr ""
 "Маҷмӯи а�бобҳо барои хондан ва фири�тодани по�т ва ахборот (mutt, tin..) ва "
 "барра�ии Web"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Компютери Шабакавӣ (мизоҷ)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Мизоҷон барои қарордодҳои гуногун, аз он ҷумла ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "��бобҳо барои о�оннамоии танзими компютери шумо"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "��бобҳои �озиргоҳ"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Коркард"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Санад�озӣ"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Китобҳо ва Чӣ тавр дар Linux ва Таъминоти Барномавии Озод"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Манбаи �изоммеъёри Linux. Пуштибонии замимаҳои коргардонони �еюм"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Хидматгори Веб"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Хидматра�они Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Фейрвол/Ма�иргузор"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Даричаи тадохули Интернет"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "По�т/�хборот"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Хидматра�они по�тии Postfix, Inn хидматра�они ахборотӣ"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Хидматра�они Феҳри�т"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Хидматра�они FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "�оми Доменӣ ва Хидматра�они �хбороти Шабакавӣ"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Хидматра�они И�тифодабарандаи Файл ва Чопгар"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Манбаи маълумот"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL ва MySQL Хидматра�они Манбаи Додаҳо"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL ва MariaDB Хидматра�они Манбаи Додаҳо"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "По�т"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Хидматра�они по�ти Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Хидматра�они манбаи маълумоти PostgreSQL ё MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Хидматра�они манбаи маълумоти PostgreSQL ё MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Хидматра�они Компютери Шабакавӣ"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Муҳити Графикӣ"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "И�тгоҳи кории KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -610,12 +724,12 @@ msgid ""
 msgstr ""
 "K Муҳити Мизи Корӣ, ин муҳити графикии а�о�ӣ бо маҷмӯи а�бобҳои ҳамроҳкунанда"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "И�тгоҳи кории Gnome"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -624,66 +738,128 @@ msgstr ""
 "Муҳити графикӣ бо маҷмӯи замимаҳо ва мизи кории бо корванд иртиботи дӯ�тона "
 "дошта"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "И�тгоҳи кории KDE"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Муҳити графикӣ бо маҷмӯи замимаҳо ва мизи кории бо корванд иртиботи дӯ�тона "
+"дошта"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "И�тгоҳи кории Gnome"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "И�тгоҳи корӣ"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Муҳити Графикӣ"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "Мизи Кории Ғалатёб"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Муҳити графикӣ бо маҷмӯи замимаҳо ва мизи кории бо корванд иртиботи дӯ�тона "
+"дошта"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Мизи Кории Ғалатёб"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Муҳити графикӣ бо маҷмӯи замимаҳо ва мизи кории бо корванд иртиботи дӯ�тона "
 "дошта"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Мизи Кории Ғалатёб"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"K Муҳити Мизи Корӣ, ин муҳити графикии а�о�ӣ бо маҷмӯи а�бобҳои ҳамроҳкунанда"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Дигар Мизҳои Кории Графикӣ"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, c-format
 msgid "Utilities"
 msgstr "Да�тгоҳҳо"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Хидматгори SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Батанзимдарори Хидматра�они Дурда�ти Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Да�тгоҳҳои Шабака/Дидабонӣ"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Дидабонии а�бобҳо, ҳи�оботи ҷараёнҳо, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "У�тодҳои Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "У�тод барои танзимдарории хидматра�он"
@@ -698,7 +874,7 @@ msgstr ""
 "баро�м.\n"
 "Мувофиқи таваккали худ давом диҳед."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -718,255 +894,255 @@ msgstr "Гузориш ба қадами `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Коргузории Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Коргузории %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> байни �лементҳо"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Дар �и�теми шумо захира кам а�т. Ҳангоми коргузорӣ намудани Mageia Linux "
-"шумо метавонед бо муаммоҳо дучор гардед. �гар ин рӯй диҳад, онгоҳ шумо "
-"метавонед коргузории матниро ба амал оред. Ҳангоми худборкунии CDROM ба`F1' "
-"ангушт занед  ва �они�н ба `text' дохил шавед."
+"Дар �и�теми шумо захира кам а�т. Ҳангоми коргузорӣ намудани %s шумо "
+"метавонед бо муаммоҳо дучор гардед. �гар ин рӯй диҳад, онгоҳ шумо метавонед "
+"коргузории матниро ба амал оред. Ҳангоми худборкунии CDROM ба`F1' ангушт "
+"занед  ва �они�н ба `text' дохил шавед."
+
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Интихоби Гурӯҳи Қуттиҳо"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Коргузории хурдтарин"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "Мизи Кории Ғалатёб"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "Мизи Кории Ғалатёб"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "Мизи Кории Ғалатёб"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Интихоби Гурӯҳи Қуттиҳо"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Интихоби қуттиҳои алоҳида"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "�ндозаи умумӣ: %d / %d MB"
+msgid "Unselect All"
+msgstr "�оинтихоби Ҳама"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Қуттии бад"
+msgid "Total size: %d / %d MB"
+msgstr "�ндозаи умумӣ: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "�у�ха: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Ҳаҷм: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d Кб\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Ҳатмӣ: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Шумо интихоб/рад кардани ин ба�таи барномаҳоро, карда наметавонед"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "мувофиқи мавҷуд набудани %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "аз �абаби %s-и қонеънагашта"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "барои пешравӣ кӯшиш намудан %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "Барои нигоҳ доштани %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Шумо ин қуттиро интихоб карда наметавонед, зеро барои кор гузоштани он ҷой "
 "кофӣне�т"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Қуттиҳои зерин коргузорӣ хоҳад шуд"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Қуттиҳои навбатӣ бо�д хориҷ гардад"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ин қуттии зарур мебошад, онро бекор карда намешавад"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr ""
 "Шумо интихоби ин ба�таи барномаҳоро рад карда наметавонед. Он аллакай "
 "коргузорӣ шудаа�т"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Шумо интихоби ин қуттиро бекор карда наметавонед. он бо�д нав гардад"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Ба таври автоматӣ қуттиҳои интихобшударо нишон диҳед"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Коргузоштан"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "Интихоби қуттӣ"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Интихоби қуттиҳо нав карда мешавад"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Коргузории хурдтарин"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Идоракунии �армафзор"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Ба�таи барномаҳоеро, ки коргузорӣ кардан мехоҳед, интихоб намоед"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Коргузорӣ шуда и�тодаа�т"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Таф�илот не�т"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Вақти боқимонда "
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Баҳодиҳии тахминӣ"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d қуттиҳо"
 msgstr[1] "%d қуттиҳо"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Ҷамба�т"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Танзим додан"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "танзимдода нашуда"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Интихоби Гурӯҳи Қуттиҳо"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -976,81 +1152,81 @@ msgstr ""
 "�гар баъзеи онҳоро партофтан хоҳед, онҳоро дар айни замон интихоб накарда "
 "метавонед."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Хатогӣ рух дод"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Лутфан, ороиши забонакро интихоб кунед"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Дар ин ҷо рӯйхати пурраи забонакҳои имконпазир дода шудаа�т"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Кор гузоштан/�фзоиш додан"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Ин коргузорӣ а�т ё нав�озӣ?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Коргузоштан"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "�фзоиш %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Дагмаи рамздошта барои %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Коргузорӣ шуда и�тодаа�т"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1059,38 +1235,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE ба танзим дароварда мешавад"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Ҷои холӣ барои барномаи худборшавии 1МБ кофӣ не�т! Коргузорӣ давом хоҳад "
-"кард, аммо барои худборшавии �и�тем ба шумо лозим а�т, то ки қи�ми "
-"худборшавии авваларо дар DiskDrake офаред"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Ба шумо лозим а�т, ки худборшавии аввали PPC PReP Boot-ро офаред! Коргузорӣ "
-"давом хоҳад кард, аммо барои худборшавии �и�тем ба шумо лозим а�т, то ки "
-"қи�ми худборшавии авваларо дар DiskDrake офаред"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1105,19 +1260,19 @@ msgstr ""
 "�гар шумо онро надошта бошед, барои радкунии коргузорӣ аз ин Cd-Rom, Бекор "
 "карданро пахш кунед."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Қуттиҳои да�тра�шаванда ҷу�туҷӯ карда мешавад..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1126,52 +1281,52 @@ msgstr ""
 "Лутфан интихоби кор андохтан ё нигоҳ доштанро дар ди�кет ба роҳ монед.\n"
 "Шаклбандӣ ҳамон хел а�т ҳамчун ди�кетҳое ки бо auto_install офарида шудаа�т."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Боркунӣ"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "�игоҳ доштан"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "Пурбокунии файлҳо"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Интихоби Гурӯҳи Қуттиҳо"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "�ндозаи интихобшуда аз ҷои да�тра�шуда зиёд а�т"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "�авъи коргузорӣ"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1180,87 +1335,111 @@ msgstr ""
 "Шумо �гон гурӯҳи қуттиҳоро интихоб накардед.\n"
 "Лутфан, коргузории па�тарини дилхоҳатонро интихоб намоед:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Бо X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Ба таври автоматӣ қуттиҳои интихобшударо нишон диҳед"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Бо �анад�озии а�о�ӣ (ма�лиҳат дода мешавад!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Дар ҳақиқат коргузории хурдтарин (алалху�у� ғайри urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Корандози худборшави аввала тайёр мешавад..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Коргузорӣ тайёр шуда и�тодаа�т"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Ҳангоми ба да�т даровардани қуттиҳо хатогие рӯй дод:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Ба ҳар ҳол давом диҳам?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Барқарор"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "Интихоби қуттиҳоро нигоҳ доштан"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "Ҳангоми коргузории қуттиҳо хатогӣ пайдо гардид:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Баъд аз пайкарабандӣ коргузорӣ мегардад"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "�ав кардан"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1283,28 +1462,29 @@ msgstr ""
 "\n"
 "Оё шумо хоҳиши коргузорӣ намудани ин навигариҳо ҳа�тед?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s дар %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Сахтафзор"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Корти овоздор"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Шумо карти �адои ISA доред?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1313,81 +1493,69 @@ msgstr ""
 "Барои батанзимдарории корти овозии шумо баъди коргузорӣ \"alsaconf\" ё "
 "\"sndconfig\"-ро корандозӣ намоед"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Корти овозӣ муай�н нагардид. \"harddrake\"-ро баъди коргузорӣ кӯшиш намоед"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Интерфей�и графикӣ"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Шабака ва Интернет"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Боваринок"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "танзимшуда"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Сатҳи �мни�т"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Фейрвол"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "фаъолшуда"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "ғайрифаъол"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Шумо X-ро ба танзим надаровардаед. Шумо дар ҳақиқат инро мехоҳед?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Корандози худборшави аввала тайёр мешавад..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Коргузорӣ тайёр шуда и�тодаа�т"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Зоҳиран шумо World-и Кӯҳна ё мошинаи номаълумро доред,  корандози худборшави "
-"yaboot барои шумо кор намекунад. Коргузорӣ давом хоҳад кард, вале шумо бо�д "
-"BootX ё ин ки во�итаҳои дигарро барои худборшавии мошини худ и�тифода баред. "
-"�ишонванди ҳа�та барои решаи fs ин: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1396,17 +1564,17 @@ msgstr ""
 "Дар ин �атҳи бехатарӣ да�тра�ӣ ба файлҳо дар қи�матҳои Windows таҳо ба "
 "идоракунанда иҷозат дода мешаванд."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Ди�кети холиро ба гардон дохил намоед %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Ди�ки нарми худкоргузорӣ офарида шуда и�тодаа�т..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1417,12 +1585,12 @@ msgstr ""
 "\n"
 "Шумо дар ҳақиқат баромадан мехоҳед?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Табрикот"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Бозхудборшавӣ"
@@ -1517,13 +1685,6 @@ msgid ""
 "Users"
 msgstr "Корвандҳо"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Шабака"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1566,6 +1727,67 @@ msgid ""
 "Exit"
 msgstr "Хуруҷ"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Корандози худборшави аввала тайёр мешавад..."
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Муҳити графикӣ бо маҷмӯи замимаҳо ва мизи кории бо корванд иртиботи "
+#~ "дӯ�тона дошта"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Мизи Кории Ғалатёб"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "Ҷои холӣ барои барномаи худборшавии 1МБ кофӣ не�т! Коргузорӣ давом хоҳад "
+#~ "кард, аммо барои худборшавии �и�тем ба шумо лозим а�т, то ки қи�ми "
+#~ "худборшавии авваларо дар DiskDrake офаред"
+
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "Ба шумо лозим а�т, ки худборшавии аввали PPC PReP Boot-ро офаред! "
+#~ "Коргузорӣ давом хоҳад кард, аммо барои худборшавии �и�тем ба шумо лозим "
+#~ "а�т, то ки қи�ми худборшавии авваларо дар DiskDrake офаред"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Зоҳиран шумо World-и Кӯҳна ё мошинаи номаълумро доред,  корандози "
+#~ "худборшави yaboot барои шумо кор намекунад. Коргузорӣ давом хоҳад кард, "
+#~ "вале шумо бо�д BootX ё ин ки во�итаҳои дигарро барои худборшавии мошини "
+#~ "худ и�тифода баред. �ишонванди ҳа�та барои решаи fs ин: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Марҳамат �амоед"
+
+#~ msgid "Select All"
+#~ msgstr "Интихоби Ҳама"
+
+#~ msgid "Bad package"
+#~ msgstr "Қуттии бад"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Корандози худборшави аввала тайёр мешавад..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Шабака"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1621,7 +1843,7 @@ msgstr "Хуруҷ"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
diff --git a/perl-install/install/share/po/th.po b/perl-install/install/share/po/th.po
index dec48e6cc..d12a502e1 100644
--- a/perl-install/install/share/po/th.po
+++ b/perl-install/install/share/po/th.po
@@ -1,54 +1,82 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# Wachara Chinsettawong <wachara@yahoo.com>, 2001
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Rockers <sumorock@hotmail.com>, 2015
+# Wachara Chinsettawong <wachara@yahoo.com>, 2001
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2001-09-10 14:24GMT+7\n"
-"Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
-"Language-Team: Thai <th@li.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-07-26 10:04+0000\n"
+"Last-Translator: Rockers <sumorock@hotmail.com>\n"
+"Language-Team: Thai (http://www.transifex.com/projects/p/mageia/language/"
+"th/)\n"
 "Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.5\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
-#, fuzzy, c-format
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
+#, c-format
 msgid "Do you have further supplementary media?"
-msgstr "คุณมีอันอื่นๆอี�หรือไม่?"
+msgstr ""
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -57,112 +85,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "ซีดี-รอม"
 
-#: any.pm:121
-#, fuzzy, c-format
+#: any.pm:163
+#, c-format
 msgid "Network (HTTP)"
-msgstr "Network interface"
+msgstr ""
 
-#: any.pm:122
-#, fuzzy, c-format
+#: any.pm:164
+#, c-format
 msgid "Network (FTP)"
-msgstr "Network interface"
+msgstr ""
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
-#, fuzzy, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "�ำลังติดต่อ�ับมิลเรอร์ไซต์เพื่อหาราย�ารของ�พ็คเ�็จที่มีให้"
+#: any.pm:248
+#, c-format
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr ""
 
-#: any.pm:187
-#, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr "�ำลังติดต่อ�ับมิลเรอร์ไซต์เพื่อหาราย�ารของ�พ็คเ�็จที่มีให้"
+#: any.pm:253
+#, c-format
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr ""
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "เลือ�มิลเรอร์ไซต์ที่จะใช้ใน�ารดาวน์โหลด�พ็คเ�็จ"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "สารบั�"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
-#, fuzzy, c-format
+#: any.pm:369
+#, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
-msgstr "Adapter %s: %s"
+msgstr ""
 
-#: any.pm:334
-#, fuzzy, c-format
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
+#, c-format
 msgid "Looking at packages already installed..."
-msgstr "คุณไม่สามารถไม่เลือ��พ�เ�จนี้เพราะมันได้ถู�ติดตั้งไป�ล้ว"
+msgstr ""
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "�ำลังหา�พ็คเ�็จที่จะทำ�ารอัพเ�รด"
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -171,87 +264,87 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "มีปั�หา�ับ�ารอ่านข้อมูลในไฟล์ %s"
 
-#: any.pm:1020
-#, fuzzy, c-format
+#: any.pm:1304
+#, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "�พ็คเ�็จเหล่านี้�ำลังจะถู�ติดตั้ง"
+msgstr ""
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "ระบบเครือข่าย"
 
-#: any.pm:1102
-#, fuzzy, c-format
+#: any.pm:1386
+#, c-format
 msgid "Please choose a media"
-msgstr "�รุณาเลือ�"
+msgstr ""
 
-#: any.pm:1118
-#, fuzzy, c-format
+#: any.pm:1402
+#, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "ไฟล์มีอยู่�ล้ว ต้อง�ารใช้?"
+msgstr ""
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "สิทธิ�ารทำงานถู�ปฎิเสท"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
-#, fuzzy, c-format
+#: any.pm:1475
+#, c-format
 msgid "Bad media %s"
-msgstr "อุป�รณ์ที่ถู�เพิ่มเข้ามา %s"
+msgstr ""
 
-#: any.pm:1234
-#, fuzzy, c-format
+#: any.pm:1519
+#, c-format
 msgid "Cannot make screenshots before partitioning"
-msgstr "โปร��รมไม่สามารถเพิ่มพาร์ติชั่นได้อี�"
+msgstr ""
 
-#: any.pm:1242
-#, fuzzy, c-format
+#: any.pm:1530
+#, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "คุณสามารถเลือ�ภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
+msgstr ""
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
-msgstr "�ำลังติดตั้ง"
+msgstr ""
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "ปรับ�ต่งค่า"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr ""
@@ -275,25 +368,25 @@ msgstr "ระบบเน็ตเวิร์��ำลังจะทำง
 msgid "Bringing down the network"
 msgstr "ระบบเน็ตเวิร์��ำลังจะหยุดทำงาน"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
-#, fuzzy, c-format
+#: media.pm:805
+#, c-format
 msgid "Copying in progress"
-msgstr "ค้นหาเจอบน port %s"
+msgstr ""
 
 #: pkgs.pm:32
 #, c-format
@@ -320,343 +413,425 @@ msgstr "ดี"
 msgid "maybe"
 msgstr "อาจจะ"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "ไม่มีคำอธิบายรายละเอียด"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "มีปั�หาเ�ิดขึ้น"
+msgstr "มีปั�หาเ�ิ�ขึ้น:"
+
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
 
-#: pkgs.pm:814
-#, fuzzy, c-format
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
+#, c-format
 msgid "%d installation transactions failed"
-msgstr "�ารติดตั้งไม่สำเร็จ"
+msgstr ""
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "�ำลังติดตั้ง�พ็คเ�็จ %s"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:16
+#, c-format
 msgid "Workstation"
-msgstr "Workstation ที่ทำงาน"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:22
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:26
+#, c-format
 msgid "Game station"
-msgstr "Workstation ที่ทำงาน"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:26
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:30
+#, c-format
 msgid "Multimedia station"
-msgstr "Multimedia - เขียน CD "
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:32
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:36
+#, c-format
 msgid "Internet station"
-msgstr "�ารเชื่อมต่อ�ับ Internet �บบ sharing"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:33
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:37
+#, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
-msgstr "เครื่องมือใน�ารอ่าน�ละส่ง mail �ละ news (pine, mutt, tin..) �ละท่องอินเตอร์เน็ต"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:38
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:42
+#, c-format
 msgid "Network Computer (client)"
-msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Clients for different protocols including ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "เครืองมือที่ช่วยใน�ารปรับ�ต่งเครื่องชองคุณให้ง่ายขึ้น"
 
-#: share/meta-task/compssUsers.pl:48
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:53
+#, c-format
 msgid "Console Tools"
-msgstr "ปิด"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "พัฒนาซอฟท์�วร์ (Development)"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "คู่มือ"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, 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:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:72
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:79
+#, c-format
 msgid "Web Server"
-msgstr "เซิร์ฟเวอร์"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:76
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:84
+#, c-format
 msgid "Groupware"
-msgstr "เวิร์��รุ๊ป (workgroup)"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:77
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:85
+#, c-format
 msgid "Kolab Server"
-msgstr "เซิร์ฟเวอร์ NIS"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
+#, c-format
 msgid "Internet gateway"
-msgstr "�ารติดต่อ internet"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:84
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:92
+#, c-format
 msgid "Mail/News"
-msgstr "/ไฟล์/_ใหม่"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:85
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:93
+#, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:88
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:97
+#, c-format
 msgid "Directory Server"
-msgstr "เรีย�คืนจา��ผ่นฟล้อปปี้"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:92
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:102
+#, c-format
 msgid "FTP Server"
-msgstr "เซิร์ฟเวอร์ NIS"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:107
+#, c-format
 msgid "DNS/NIS"
-msgstr "ใช้ NIS"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:97
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:108
+#, c-format
 msgid "Domain Name and Network Information Server"
-msgstr "ชื่อโดเมน"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:100
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:112
+#, c-format
 msgid "File and Printer Sharing Server"
-msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:101
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:113
+#, c-format
 msgid "NFS Server, Samba server"
-msgstr "เซิร์ฟเวอร์ NIS"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "�านข้อมูล"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
+msgid "PostgreSQL and MariaDB Database Server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "จดหมาย"
 
-#: share/meta-task/compssUsers.pl:114
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:129
+#, c-format
 msgid "Postfix mail server"
-msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
+msgid "PostgreSQL or MariaDB database server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:125
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:142
+#, c-format
 msgid "Network Computer server"
-msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "�ารทำงาน�บบ�ราฟฟิ�"
 
-#: share/meta-task/compssUsers.pl:134
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:152
+#, c-format
 msgid "KDE Workstation"
-msgstr "Workstation ที่ทำงาน"
+msgstr "KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:139
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:158
+#, c-format
 msgid "GNOME Workstation"
-msgstr "Workstation ที่ทำงาน"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "พื้นที่ทำงาน"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Graphical Desktops อื่นๆ"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, 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:223
 #, c-format
 msgid "Utilities"
 msgstr "อรรถประโยชน์"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
+#, c-format
 msgid "SSH Server"
-msgstr "เซิร์ฟเวอร์ NIS"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:180
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:230
+#, c-format
 msgid "Webmin"
-msgstr "อุป�รณ์"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:181
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:231
+#, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "�ารคอนฟิ� Internet"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:185
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:235
+#, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "�ารคอนฟิ�ระบบเน็ตเวิร์�"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:240
+#, c-format
 msgid "Mageia Wizards"
-msgstr "Control Center"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:191
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:241
+#, c-format
 msgid "Wizards to configure server"
-msgstr "�ารคอนฟิ�เครื่องพิมพ์"
+msgstr ""
 
 #: steps.pm:85
 #, c-format
@@ -667,7 +842,7 @@ msgstr ""
 "มีความผิดพลาดเ�ิดขึ้น �ต่โปร��รมไม่สามารถ��้ไขได้\n"
 "หา�ทำงานต่ออาจเ�ิดความเสียหายได้"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -687,330 +862,330 @@ msgstr "เข้าสู่ขั้นตอน `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "�ารติดตั้งลีนุ�ซ์-�มนเดร� %s"
+msgid "%s Installation %s"
+msgstr ""
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> ระหว่างตัวเลือ�"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "เครื่องของคุณมีทรัพยา�รค่อนข้างต่ำคุณอาจมีปั�หาติดตั้ง \n"
-"Mageia Linux  ถ้าเป็นเช่นนั้น �รุณาทดลองติดตั้ง�บบ text \n"
+"%s  ถ้าเป็นเช่นนั้น �รุณาทดลองติดตั้ง�บบ text \n"
 "�รุณา�ด F1 ขณะ boot จา� cdrom �ล้วพิมพ์ text"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Media Selection"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr ""
+
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "ออ�จา��ารติดตั้ง"
+msgstr ""
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "พื้นที่ทำงาน"
+msgstr ""
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "พื้นที่ทำงาน"
+msgstr ""
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "พื้นที่ทำงาน"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "เลือ��ลุ่ม�พ็คเ�็จ"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Individual package selection"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "ขนาดรวม: %d / %d MB "
+msgid "Unselect All"
+msgstr ""
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "�พ็คเ�็จชำรุด"
+msgid "Total size: %d / %d MB"
+msgstr "ขนาดรวม: %d / %d MB "
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "เวอร์ชัน:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "ขนาด:"
 
-#: steps_gtk.pm:406
-#, fuzzy, c-format
+#: steps_gtk.pm:422
+#, c-format
 msgid "%d KB\n"
-msgstr "ขนาด: %d KB\n"
+msgstr ""
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "ความสำคั�:"
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "คุณไม่สามารถเลือ�/ไม่เลือ��พ�เ�จนี้"
 
-#: steps_gtk.pm:445
-#, fuzzy, c-format
+#: steps_gtk.pm:462
+#, c-format
 msgid "due to missing %s"
-msgstr "ไม่มี kdesu "
+msgstr ""
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "คุณไม่สามารถเลือ� package นี้เนื่องจา�คุณมีพื้นที่ไม่เพียงพอ"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "�พ็คเ�็จเหล่านี้�ำลังจะถู�ติดตั้ง"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "�พ็คเ�็จเหล่านี้�ำลังจะถู�ลบ"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "นี่คือ�พ�เ�จที่ต้องติดตั้ง ไม่สามารถไม่เลือ�"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "คุณไม่สามารถไม่เลือ��พ�เ�จนี้เพราะมันได้ถู�ติดตั้งไป�ล้ว"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "คุณไม่สามารถไม่เลือ��พ�เ�จนี้  มันจำเป็นที่จะต้องถู� upgrade"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "ติดตั้ง"
 
-#: steps_gtk.pm:499
-#, fuzzy, c-format
+#: steps_gtk.pm:515
+#, c-format
 msgid "Load/Save selection"
-msgstr "เลือ��ลุ่ม�พ็คเ�็จ"
+msgstr ""
 
-#: steps_gtk.pm:500
-#, fuzzy, c-format
+#: steps_gtk.pm:516
+#, c-format
 msgid "Updating package selection"
-msgstr "บันทึ��ลุ่ม�พ็คเ�็จที่เลือ�"
+msgstr ""
 
-#: steps_gtk.pm:505
-#, fuzzy, c-format
+#: steps_gtk.pm:521
+#, c-format
 msgid "Minimal install"
-msgstr "ออ�จา��ารติดตั้ง"
+msgstr ""
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "�ารบริหารโปร��รม"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "เลือ��พ็คเ�็จที่คุณต้อง�ารติดตั้ง"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "�ำลังติดตั้ง"
 
-#: steps_gtk.pm:565
-#, fuzzy, c-format
+#: steps_gtk.pm:581
+#, c-format
 msgid "No details"
-msgstr "รายละเอียด"
+msgstr ""
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "เวลาที่เหลือ "
+msgstr "เวลาที่เหลือ:"
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "�ารประเมิน"
+msgstr ""
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "�พ็คเ�็จ %d ชุด"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "รวมความ"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "�ารปรับ�ต่ง"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
-#, fuzzy, c-format
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
+#, c-format
 msgid "not configured"
-msgstr "คอนฟิ�ใหม่"
-
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "เลือ��ลุ่ม�พ็คเ�็จ"
+msgstr ""
 
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "มีปั�หาเ�ิดขึ้น"
 
-#: steps_interactive.pm:104
-#, fuzzy, c-format
+#: steps_interactive.pm:105
+#, c-format
 msgid "Please choose your keyboard layout"
-msgstr "คุณต้อง�ารเลือ�คีย์บอร์ดเลย์เอ้าท์�บบใด "
+msgstr ""
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "ต่อไปนี้คือ keyboard ที่ใช้ได้"
+msgstr ""
 
-#: steps_interactive.pm:146
-#, fuzzy, c-format
+#: steps_interactive.pm:153
+#, c-format
 msgid "Install/Upgrade"
-msgstr "ติดตั้ง/อัพเ�รด "
+msgstr ""
 
-#: steps_interactive.pm:150
-#, fuzzy, c-format
+#: steps_interactive.pm:157
+#, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "นี่เป็น�ารติดตั้งหรือ�ารอัพเ�รด"
+msgstr ""
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "ติดตั้ง"
 
-#: steps_interactive.pm:154
-#, fuzzy, c-format
+#: steps_interactive.pm:161
+#, c-format
 msgid "Upgrade %s"
-msgstr "Update"
+msgstr ""
 
-#: steps_interactive.pm:172
-#, fuzzy, c-format
+#: steps_interactive.pm:184
+#, c-format
 msgid "Encryption key for %s"
-msgstr "รหัสผ่านไม่เหมือน�ัน"
+msgstr ""
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "�ำลังติดตั้ง"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1019,32 +1194,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "คอนฟิ� IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1057,158 +1217,182 @@ msgstr ""
 "�รุณาใส่ CD-ROM \"%s\" �ละ�ด OK\n"
 "ถ้่าคุณไม่มี �รุณา�ด ย�เลิ� (cancel) เพื่อหลี�เลี่ยง�ารติดตั้งจา� CD-ROM นี้"
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "�ำลังหา�พ็คเ�็จที่มีอยู่"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "โหลด"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "บันทึ�"
 
-#: steps_interactive.pm:453
-#, fuzzy, c-format
+#: steps_interactive.pm:438
+#, c-format
 msgid "Bad file"
-msgstr "เปิด�ฟ้ม"
+msgstr ""
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "เลือ��ลุ่ม�พ็คเ�็จ"
+msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "�ำลังติดตั้ง�พ็คเ�็จ %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "�ำลังเตรียม�ารติดตั้ง"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "�ำลังติดตั้ง�พ็คเ�็จ %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "มีปั�หา�ารลำดับของ�พ็คเ�็จ:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "ทำงานต่อหรือไม่?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
-#, fuzzy, c-format
+#: steps_interactive.pm:682
+#, c-format
 msgid "Go back to media and packages selection"
-msgstr "บันทึ��ลุ่ม�พ็คเ�็จที่เลือ�"
+msgstr ""
 
-#: steps_interactive.pm:683
-#, fuzzy, c-format
+#: steps_interactive.pm:685
+#, c-format
 msgid "There was an error installing package %s."
-msgstr "มีปั�หา�ารติดตั้งของ�พ็คเ�็จ:"
+msgstr ""
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "�ารคอนฟิ�หลัง�ารติดตั้ง"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
-#, fuzzy, c-format
+#: steps_interactive.pm:739 steps_list.pm:47
+#, c-format
 msgid "Updates"
 msgstr "อัพเดท"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1221,121 +1405,114 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s บน %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "ฮาร์ด�วร์"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Sound card"
 
-#: steps_interactive.pm:919
-#, fuzzy, c-format
+#: steps_interactive.pm:929
+#, c-format
 msgid "Do you have an ISA sound card?"
-msgstr "คุณมีอันอื่นๆอี�หรือไม่?"
+msgstr ""
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: steps_interactive.pm:931
-#, fuzzy, c-format
+#: steps_interactive.pm:941
+#, c-format
 msgid "Graphical interface"
-msgstr "ให้เป็น�ราฟฟิคเมื่อเริ่มต้น"
+msgstr ""
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "เน็ตเวิร์ค�ับอินเตอร์เน็ต"
 
-#: steps_interactive.pm:949
-#, fuzzy, c-format
+#: steps_interactive.pm:960
+#, c-format
 msgid "Proxies"
-msgstr "Profile: "
+msgstr ""
 
-#: steps_interactive.pm:950
-#, fuzzy, c-format
+#: steps_interactive.pm:961
+#, c-format
 msgid "configured"
-msgstr "คอนฟิ�ใหม่"
+msgstr ""
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "ระดับความปลอดภัย"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: steps_interactive.pm:983
-#, fuzzy, c-format
+#: steps_interactive.pm:995
+#, c-format
 msgid "activated"
-msgstr "�อ็คทีฟ"
+msgstr ""
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "ไม่ใช้งาน"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "�ำลังเตรียมบูตโหลดเดอร์"
-
-#: steps_interactive.pm:1027
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Be patient, this may take a while..."
+msgid "Preparing initial startup program..."
 msgstr ""
 
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1041
 #, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
+msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "ให้ใส่�ผ่นฟล้อปปี้ลงในไดรว์ %s "
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "�ำลังเตรียม�ารติดตั้งลงบน floppy"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1346,12 +1523,12 @@ msgstr ""
 "\n"
 "คุณต้อง�ารออ�จา��ารติดตั้งจริงๆหรือไม่?"
 
-#: steps_interactive.pm:1106
-#, fuzzy, c-format
+#: steps_interactive.pm:1112
+#, c-format
 msgid "Congratulations"
-msgstr "ขอ�สดงความยินดี"
+msgstr "ยินดีด้วย"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr ""
@@ -1446,13 +1623,6 @@ msgid ""
 "Users"
 msgstr "ผู้ใช้"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "ระบบเครือข่าย"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1494,96 +1664,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "เลิ�ทำงาน"
-
-#, fuzzy
-#~ msgid "Downloading file %s..."
-#~ msgstr "บันทึ�ลงไฟล์"
-
-#, fuzzy
-#~ msgid "IceWm Desktop"
-#~ msgstr "พื้นที่ทำงาน"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "�ำลังติดต่อ�ับมิลเรอร์ไซต์เพื่อหาราย�ารของ�พ็คเ�็จที่มีให้"
-
-#, fuzzy
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "ไม่สามารถ forkได้.%s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "สร้างfloppyสำหรับ�ารติดตั้ง�บบออโตเมติ�"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "�ารติดตั้ง�บบออโตเมติ�สามารถทำงาน�บบเต็มรูป�บบหา�ต้อง�าร\n"
-#~ "ใน�รณีนั้นมันจะใช้ harddisk  ทั้งหมด\n"
-#~ "(มันเหมาะ�ับ�ารติดตั้งบนเครื่องอื่น)\n"
-#~ "คุณอาจอยา��ลับไปเริ่มต้นติดตั้งใหม่\n"
-
-#~ msgid "Replay"
-#~ msgstr "เรีย�อี�ครั้ง"
-
-#~ msgid "Automated"
-#~ msgstr "อัตโนมัติ"
-
-#~ msgid "Save packages selection"
-#~ msgstr "บันทึ��ลุ่ม�พ็คเ�็จที่เลือ�"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "คุณต้อง�ารใช้ aboot หรือไม่"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "�ารติดตั้ง aboot ล้มเหลว\n"
-#~ "พยายามติดตั้งถึง�ม้พาติชั่น�ร�อาจจะเสียหาย?"
-
-#~ msgid "All"
-#~ msgstr "ทั้งหมด"
-
-#~ msgid "TV card"
-#~ msgstr "TV card"
-
-#~ msgid "Boot"
-#~ msgstr "บู๊ต"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "�ารตรวจสอบสิทธิ์�ารใช้งาน"
-
-#~ msgid "%d packages"
-#~ msgstr "�พ็คเ�็จ %d ชุด"
-
-#~ msgid "Language"
-#~ msgstr "เลือ�ภาษาที่คุณใช้"
-
-#~ msgid "License"
-#~ msgstr "สั��าอนุ�าต"
-
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "เลือ�ชุด�ารติดตั้ง"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "�ารประเมิน"
-
-#, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "เลือ��พ็คเ�็จ"
-
-#~ msgid "Users"
-#~ msgstr "ผู้ใช้"
-
-#~ msgid "Networking"
-#~ msgstr "ระบบเครือข่าย"
-
-#~ msgid "Configure X"
-#~ msgstr "คอนฟิ�ระบบ X"
diff --git a/perl-install/install/share/po/tl.po b/perl-install/install/share/po/tl.po
index c4399e4dc..517a48e9c 100644
--- a/perl-install/install/share/po/tl.po
+++ b/perl-install/install/share/po/tl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2004-09-15 13:35+0200\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -17,38 +17,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Pang-opisina na Workstation"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "For developers!"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Thank you!"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, fuzzy, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Mayroon ba kayong isa pa?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -57,116 +82,181 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, fuzzy, c-format
 msgid "Network (HTTP)"
 msgstr "Network %s"
 
-#: any.pm:122
+#: any.pm:164
 #, fuzzy, c-format
 msgid "Network (FTP)"
 msgstr "Network %s"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr ""
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Nakikipag-alam sa web site ng Mageia Linux para makuha ang talaan ng mga "
-"available na mirror..."
+"Nakikipag-alam sa web site ng %s para makuha ang talaan ng mga available na "
+"mirror..."
 
-#: any.pm:187
+#: any.pm:253
 #, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Nakikipag-alam sa web site ng Mageia Linux para makuha ang talaan ng mga "
-"available na mirror..."
+"Nakikipag-alam sa web site ng %s para makuha ang talaan ng mga available na "
+"mirror..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Pumili ng mirror kung saan kukunin ang mga package"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Directory"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, fuzzy, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Hindi mahanap ang %s sa %s"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Naghahanap ng mga package na naka-install..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Naghahanap ng mga package na i-a-upgrade..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -180,87 +270,87 @@ msgstr ""
 "\n"
 "Gusto ninyo ba talagang tanggalin ang mga package na ito?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "May error sa pagbabasa ng file na %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, fuzzy, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "- %s ay tinanggal\n"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr ""
 
-#: any.pm:1079
+#: any.pm:1363
 #, fuzzy, c-format
 msgid "FTP"
 msgstr "gFTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, fuzzy, c-format
 msgid "NFS"
 msgstr "PFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Network"
 
-#: any.pm:1102
+#: any.pm:1386
 #, fuzzy, c-format
 msgid "Please choose a media"
 msgstr "Pumili ka"
 
-#: any.pm:1118
+#: any.pm:1402
 #, fuzzy, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Mayroon ng file. Gamitin ito?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Pahintulot ipinagkaila"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, fuzzy, c-format
 msgid "Bad media %s"
 msgstr "idinagdag ang medium na %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Hindi makagawa ng mga screenshot bago mag-partisyon"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ang mga screenshot ay magiging available matapos ang install sa %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, fuzzy, c-format
 msgid "Installation"
 msgstr "Nag-i-install"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Configuration"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Dapat ninyo ring i-format ang %s"
@@ -285,22 +375,22 @@ msgstr "Ginagawang \"up\" ang network"
 msgid "Bringing down the network"
 msgstr "Ginagawang \"down\" ang network"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, fuzzy, c-format
 msgid "Copying in progress"
 msgstr "Tumatakbo ang pagtitiktik"
@@ -330,73 +420,98 @@ msgstr "mainam"
 msgid "maybe"
 msgstr "baka sakali"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, fuzzy, c-format
+msgid "No description"
+msgstr "sa mga paglalarawan"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "May \"error\" na nangyari"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "May nangyaring fatal error: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transaksyong pag-i-install ay nabigo"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Ini-install ang package na %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Workstation"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Pang-opisina na Workstation"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Mga pang-opisinang program: mga wordprocessor (OpenOffice.org Writer, "
-"Kword), mga spreadsheet (OpenOffice.org Calc, Kspread), mga pdf viewer, etc"
+"Mga pang-opisinang program: mga wordprocessor (LibreOffice Writer, Kword), "
+"mga spreadsheet (LibreOffice Calc, Kspread), mga pdf viewer, etc"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Pang-laro na istasyon"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Mga nakakalibang na program: arcade, mga board game, strategy, etc"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Pang-multimedia na istasyon"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Mga program na pang-play/edit ng tunog, musika at video"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Pang-internet na istasyon"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -405,193 +520,193 @@ msgstr ""
 "Kumpol ng mga kagamitang pangbasa at pangsulat ng mail at news (mutt, tin..) "
 "at pang-browse ng Web"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Network Computer (client)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Mga client para sa iba't-ibang mga protocol kasama ang ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Kagamitang pangpadali ng configuration ng inyong computer"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Kagamitang Pang-Console"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Mga editor, shell, file tool, terminal"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Paglinang (Development)"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "mga C at C++ development library, program at include file"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentasyon"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Mga Libro at Howto tungkol sa Linux at Free Software"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Suporta para sa mga third party application"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Web Server"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, 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:88 share/meta-task/compssUsers.pl:138
 #, 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:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet gateway"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, fuzzy, c-format
 msgid "Mail/News"
 msgstr "/File/_Bago"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, fuzzy, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix mail server"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, fuzzy, c-format
 msgid "Directory Server"
 msgstr "Directory Kung Saan Kukunin ang Ibabalik"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Server"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, fuzzy, c-format
 msgid "DNS/NIS"
 msgstr "DNS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, fuzzy, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domain Name Server"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, fuzzy, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Printer Server"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Database"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, fuzzy, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL o MySQL database server"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL o MariaDB database server"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Mail"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix mail server"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL o MySQL database server"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL o MariaDB database server"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Network Computer server"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Graphical na Kapaligiran"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE Workstation"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -600,12 +715,12 @@ msgstr ""
 "Ang K Desktop Environment, ang pinakabatayang graphical environment na may "
 "koleksyon ng mga kasabay na kagamitan"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME Workstation"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -614,66 +729,129 @@ msgstr ""
 "Isang graphical environment na may kumpol ng mga user-friendly (madaling "
 "gamitin) na application at kagamitang pang-desktop"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE Workstation"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Isang graphical environment na may kumpol ng mga user-friendly (madaling "
+"gamitin) na application at kagamitang pang-desktop"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME Workstation"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Workstation"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Graphical na Kapaligiran"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "Desktop"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Isang graphical environment na may kumpol ng mga user-friendly (madaling "
+"gamitin) na application at kagamitang pang-desktop"
+
+#: share/meta-task/compssUsers.pl:189
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "Desktop"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
 #, fuzzy, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Isang graphical environment na may kumpol ng mga user-friendly (madaling "
 "gamitin) na application at kagamitang pang-desktop"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Desktop"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
+"Ang K Desktop Environment, ang pinakabatayang graphical environment na may "
+"koleksyon ng mga kasabay na kagamitan"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Ibang Mga Graphical Desktop"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, fuzzy, c-format
 msgid "Utilities"
 msgstr "Philippines"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Server"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, fuzzy, c-format
 msgid "Webmin"
 msgstr "Webcam"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, fuzzy, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Configuration ng Terminal Server"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, fuzzy, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Pagmo-monitor ng Network"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, fuzzy, c-format
 msgid "Mageia Wizards"
 msgstr "<b>Mageia Store</b>"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, fuzzy, c-format
 msgid "Wizards to configure server"
 msgstr "Nabigong i-configure ang printer na \"%s\"!"
@@ -687,7 +865,7 @@ msgstr ""
 "May \"error\" na nangyari, pero hindi ko alam kung paano ayusin\n"
 "ng maganda. Mapanganib magpatuloy."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -707,335 +885,335 @@ msgstr "Pumpasok sa hakbang na `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Pag-install ng Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Pag-install ng %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> pagitan ng mga elemento"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Ang inyong sistema mababa sa kakayahan. Maaari kayong magkaproblema\n"
-"sa pag-install ng Mageia Linux. Kung mangyari ito, maaari ninyong subukan\n"
+"sa pag-install ng %s. Kung mangyari ito, maaari ninyong subukan\n"
 "ang \"text install\". Para dito, pindutin ang `F1' kapag nagbo-boot sa "
 "CDROM,\n"
 "at ipasok ang `text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, fuzzy, c-format
+msgid "Media Selection"
+msgstr "Pagpili ng Pangkat ng mga Package"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Maliitang install"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "Desktop"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "Desktop"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "Desktop"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Pagpili ng Pangkat ng mga Package"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Isa-isang pagpili ng package"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Kabuuang laki: %d / %d MB"
+msgid "Unselect All"
+msgstr "Di-nakapili Lahat"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Sirang package"
+msgid "Total size: %d / %d MB"
+msgstr "Kabuuang laki: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Version: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Laki: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Kahalagahan: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Maaari ninyong piliin/di-piliin ang package na ito"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "dahil sa nawawalang %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "dahil sa hindi na-satisfy na %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "sinusubukang i-promote ang %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "para maitago ang %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Hindi ninyo maaaring piliin ang package na ito dahil walang sapat na puwang"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Ang mga sumusunod na package ay ii-install"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Ang mga sumusunod na package ay tatanggalin"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ito ay kinakailangang package, hindi ito maaring di-piliin"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Hindi ninyo maaaring di-piliin ang package na ito. Naka-install na ito"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr ""
 "Hindi ninyong maaaring di-piliin ang package na ito. Dapat i-upgrade ito"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Ipakita kaagad ang mga napiling package"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "I-install"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, fuzzy, c-format
 msgid "Load/Save selection"
 msgstr "Pagpili ng package"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Ina-update ang pagpili ng package"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Maliitang install"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Pangangasiwa ng Software"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Piliin ang mga package na gusto ninyong i-install"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Nag-i-install"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Walang detalye"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Nalalabing oras "
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Nagkukuro-kuro"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d mga package"
 msgstr[1] "%d mga package"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Kabuuan"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Configure"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "hindi na-configure"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Pagpili ng Pangkat ng mga Package"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "May \"error\" na nangyari"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Piliin ang inyong layout ng keyboard"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Narito ang buong talaan ng mga available na keyboard"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "I-install/I-upgrade"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Ito ba ay install o upgrade?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, fuzzy, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "I-install"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "I-pgrade ang %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Encryption key para sa %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, fuzzy, c-format
 msgid "New Installation"
 msgstr "Nag-i-install"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1044,38 +1222,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Kino-configure ang IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Walang puwang para sa 1MB na bootstrap! Magpapatuloy ang install, pero para "
-"ma-boot ang inyong sistema, kailangan ninyong gumawa ng partisyon ng "
-"bootstrap sa DiskDrake"
-
-#: steps_interactive.pm:295
-#, fuzzy, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Walang puwang para sa 1MB na bootstrap! Magpapatuloy ang install, pero para "
-"ma-boot ang inyong sistema, kailangan ninyong gumawa ng partisyon ng "
-"bootstrap sa DiskDrake"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1089,19 +1246,19 @@ msgstr ""
 "ang Ok pagkatapos. Kung wala kayo nito, pindutin ang Cancel para iwasang\n"
 "mag-install mula sa CD-ROM na ito."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Naghahanap ng mga available na package..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, fuzzy, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1110,52 +1267,52 @@ msgstr ""
 "Pakipili ang i-load o i-save ang pagpili ng package sa floppy.\n"
 "Ang format ay katulad ng sa mga ginawang auto_install na floppy."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, fuzzy, c-format
 msgid "Load"
 msgstr "XLoad"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "I-save"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, fuzzy, c-format
 msgid "Bad file"
 msgstr "I-load ang mga file"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, fuzzy, c-format
 msgid "Desktop Selection"
 msgstr "Pagpili ng Pangkat ng mga Package"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Ang piniling laki ay mas malaki sa available na puwang"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Uri ng install"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1164,87 +1321,111 @@ msgstr ""
 "Wala pa kayong napiling pangkat ng mga package.\n"
 "Pakipili ang maliitang pag-i-install na gusto ninyo:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "May X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, fuzzy, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Ini-install ang package na %s"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "May pinakabatayang dokumento (inirerekomenda!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Talagang maliitang install (walang urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "Inihahanda ang bootloader..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Inihahanda ang pag-i-install"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Ini-install ang package na %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "May error sa pagsasaayos ng mga package:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Magpatuloy pa rin?"
 
-#: steps_interactive.pm:677
-#, c-format
+#: steps_interactive.pm:679
+#, fuzzy, c-format
 msgid "Retry"
-msgstr ""
+msgstr "Ibalik"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, fuzzy, c-format
 msgid "Go back to media and packages selection"
 msgstr "I-save ang mga piniling package"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, fuzzy, c-format
 msgid "There was an error installing package %s."
 msgstr "May error sa pag-i-install ng mga package na:"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Configuration matapos ang install"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Mga update"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1267,28 +1448,29 @@ msgstr ""
 "\n"
 "Gusto ninyong i-install ang mga update ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s sa %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Sound card"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Mayroon ba kayong ISA na sound card?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1297,83 +1479,71 @@ msgstr ""
 "Patakbuhin ang \"alsaconf\" o \"sndconfig\" pagkatapos mag-install para i-"
 "configure ang iyong sound card"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Walang natiktikang sound card. Subukan ang \"harddrake\" pagkatapos mag-"
 "install"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Graphical interface"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Network & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Mga Proxy"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "na-configure"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Level ng Seguridad"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Firewall"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "na-activate"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "na-disable"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Hindi pa ninyo na-configure ang X. Sigurado kayong gusto ninyong gawin ito?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "Inihahanda ang bootloader..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Inihahanda ang pag-i-install"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1038
-#, fuzzy, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Mukhang mayroon kayong OldWorld (makaluma) o Hindi Kilalang\n"
-"makina, hindi gagana ang yaboot para sa inyo.\n"
-"Ang install ay magpapatuloy, ngunit kakailanganin ninyong\n"
-"gamitin ang BootX o ibang paraan para i-boot ang inyong makina"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1382,17 +1552,17 @@ msgstr ""
 "Sa level ng seguridad na ito, ang access sa mga file na nasa partisyon ng "
 "Windows ay limitado sa tagapangasiwa."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Magsuksok ng blangkong floppy sa drive %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Lumilikha ng auto install floppy..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1403,12 +1573,12 @@ msgstr ""
 "\n"
 "Gusto ninyo ba talagang sumuko ngayon?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Maligayang bati"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "I-reboot"
@@ -1445,7 +1615,7 @@ msgstr "Mouse"
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
-msgstr "Pagtitiktik ng hard drive"
+msgstr "Pagtitiktik ng hard disk drive"
 
 #: steps_list.pm:21 steps_list.pm:22
 #, c-format
@@ -1503,13 +1673,6 @@ msgid ""
 "Users"
 msgstr "Users"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Pagne-Network"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1552,6 +1715,69 @@ msgid ""
 "Exit"
 msgstr "Exit"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Inihahanda ang bootloader..."
+
+#, fuzzy
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Isang graphical environment na may kumpol ng mga user-friendly (madaling "
+#~ "gamitin) na application at kagamitang pang-desktop"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Desktop"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "Walang puwang para sa 1MB na bootstrap! Magpapatuloy ang install, pero "
+#~ "para ma-boot ang inyong sistema, kailangan ninyong gumawa ng partisyon ng "
+#~ "bootstrap sa DiskDrake"
+
+#, fuzzy
+#~ msgid ""
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
+#~ msgstr ""
+#~ "Walang puwang para sa 1MB na bootstrap! Magpapatuloy ang install, pero "
+#~ "para ma-boot ang inyong sistema, kailangan ninyong gumawa ng partisyon ng "
+#~ "bootstrap sa DiskDrake"
+
+#, fuzzy
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Mukhang mayroon kayong OldWorld (makaluma) o Hindi Kilalang\n"
+#~ "makina, hindi gagana ang yaboot para sa inyo.\n"
+#~ "Ang install ay magpapatuloy, ngunit kakailanganin ninyong\n"
+#~ "gamitin ang BootX o ibang paraan para i-boot ang inyong makina"
+
+#~ msgid "Welcome"
+#~ msgstr "Maligayang pagdating"
+
+#~ msgid "Select All"
+#~ msgstr "Pinili Lahat"
+
+#~ msgid "Bad package"
+#~ msgstr "Sirang package"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Inihahanda ang bootloader..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Pagne-Network"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
@@ -1604,14 +1830,14 @@ msgstr "Exit"
 
 #~ msgid ""
 #~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
+#~ "in that case it will take over the hard disk drive!!\n"
 #~ "(this is meant for installing on another box).\n"
 #~ "\n"
 #~ "You may prefer to replay the installation.\n"
 #~ msgstr ""
 #~ "Ang auto install ay maaaring maging talagang\n"
 #~ "automatic kung gugustuhin. Sa ganitong kaso\n"
-#~ "hahawakan nito ang hard drive!! (Ito ay sinadya\n"
+#~ "hahawakan nito ang hard disk drive!! (Ito ay sinadya\n"
 #~ "para sa pag-i-install sa ibang box o makina).\n"
 #~ "\n"
 #~ "Maaari ninyong naising i-replay ang pag-i-install.\n"
diff --git a/perl-install/install/share/po/tr.po b/perl-install/install/share/po/tr.po
index 9485f6189..cd0ade290 100644
--- a/perl-install/install/share/po/tr.po
+++ b/perl-install/install/share/po/tr.po
@@ -1,66 +1,87 @@
-# translation of DrakX.po to Turkish
+# translation of drakx_install-tr.po to Turkish
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # ############################################
-#
-#
 # #############################################
 # Ö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Ş <atilla_ontas@hotmail.com>, 2008.
-# Atilla ÖNTAŞ <atilla_ontas@mandriva.org>, 2008.
-# Atilla ÖNTAŞ <atilla_ontas@mandriva.com>, 2009.
-# Atilla ÖNTAŞ <atilla_ontas@mandriva.org>, 2010.
+# Atilla ÖNTAŞ <atilla_ontas@hotmail.com>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
+# Fırat Kutlu <firatkutlu@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2010-04-26 18:59+0200\n"
-"Last-Translator: Atilla ÖNTAŞ <atilla_ontas@mandriva.org>\n"
-"Language-Team: Turkish <cooker-i18n@mandrivalinux.org>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 02:01+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: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Masaüstünüz bir USB anahtarda"
+msgid "Join Us!"
+msgstr "Bize Katılın!"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "100%% açık kaynaklı Mageia Linux Dağıtımı"
+msgid "Make it yours!"
+msgstr "Sizin olsun!"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Mageia One ile Linux' u zahmetsizce keÅŸfedin"
+msgid "Your choice!"
+msgstr "Sizin seçiminiz!"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Tam bir Mageia masaüstü ve desteği"
+msgid "Office tools"
+msgstr "Ofis araçları"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: herkesin gereksinimine göre dağıtımlar"
+msgid "Home entertainment"
+msgstr "Ev eÄŸlencesi"
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr "Çocuklar için"
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr "Aile için!"
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr "Geliştiriciler için!"
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Teşekkürler!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Özgür olun!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Başka tamamlayıcı veri kaynağınız var mı?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -73,92 +94,87 @@ msgstr ""
 "\n"
 "Yapılandırılacak tamamlayıcı bir veri kaynağınız var mı?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "AÄŸ (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "AÄŸ (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "AÄŸ (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Yansının URL bağlantı adresi?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL bağlantı adresi ftp:// veya http:// ile başlamak zorundadır."
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Yansı adreslerini almak için Mageia Linux web sayfasına bağlantı kuruluyor..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Yansı adreslerini almak için %s web sayfasına bağlantı kuruluyor..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr ""
-"Yansı adreslerini almak için Mageia Linux web sayfasına bağlantı kurma "
-"başarısız"
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr "Yansı adreslerini almak için %s web sayfasına bağlantı kurma başarısız"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Paketleri alacağınız bir yansı adresi seçiniz"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS kurulumu"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "NFS kaynağı için bir sunucu adı ve dizini giriniz."
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Makine adı yok"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Dizin \"/\" ile başlamalıdır."
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS bağı için sunucu adı?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Dizin"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Tamamlayıcı"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -167,23 +183,95 @@ msgstr ""
 "Bu yansı üzerinde paket listesi bulunamadı. Yerinin doğru olduğundan emin "
 "olun."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "Core Release"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Tainted Release"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "Nonfree Release"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Makinenizdeki bazı donanımların özgür yazılım sürücülerinin çalışması için, "
+"özgür olmayan üretici yazılımına gereksinimi vardır."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "\"%s\" etkinleÅŸtirmelisiniz"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" sistemlerin çeşitli parçalarını ve uygulamalarını içerir"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" özgür olmayan yazılım içerir.\n"
+
+#: any.pm:477
+#, 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 ""
+"Belirli aygıtların çalışması için gereken üretici yazılımlarını da içerir "
+"(örn: bazı ATI/AMD ekran kartları, bazı ağ kartları, bazı RAID kartları, ...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"\"%s\" yazılım patentlerinden dolayı her ülkede dağıtılamayan yazılım içerir."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "İlave yeteneklerle yenilenen \"%s\" adresinden yazılım da içerir."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Ä°sterseniz burada daha fazla ortam etkinleÅŸtirebilirsiniz."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "Bu araç \"%s\" ortamı için paket güncellemelerini sağlar"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Kurulu paketler inceleniyor..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Yükseltilecek paketler bulunuyor"
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Yükseltmeye hazırlık olmak üzere paketler kaldırılıyor..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -196,87 +284,87 @@ msgstr ""
 "\n"
 "Bu paketleri kaldırmak istiyor musunuz?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s dosyası okunurken hata oluştu"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Şu diskler yeniden adlandırılacak:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (eski adı %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "AÄŸ"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Lütfen bir medya seçin"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Bu dosya zaten var. Üzerine yazılsın mı?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Ä°zin verilmedi"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "Kötü NFS adı"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Kötü veri kaynağı %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Disk bölümlemesi yapılmadan ekran örnekleri alınamaz."
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekran örnekleri %s kurulduktan sonra mümkün olacak"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Kurulum"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Ayrıca %s biçemlendirilmelidir"
@@ -300,22 +388,22 @@ msgstr "Ağ bağlanıyor"
 msgid "Bringing down the network"
 msgstr "Ağ ayrılıyor"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Dosya alınıyor. Lütfen bekleyin"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "ortam eklenemiyor"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Bazı paketler sonradan kullanım için disklere kopyalanıyor"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopyalama sürüyor"
@@ -345,7 +433,23 @@ msgstr "güzel"
 msgid "maybe"
 msgstr "belki"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "XML meta-data'dan paket bilgileri alınıyor..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"\"%s\" ortamı için xml bilgisi yok, yalnız %s paketi için kısmi bir sonuç,"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Tanımlanmamış"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -354,66 +458,76 @@ msgstr ""
 "%s tarafından istenen bazı paketler kurulamaz:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Bir hata oluÅŸtu:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Bir ölümcül hata oluştu: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Yeniden sorma"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d kurulum yönergesi başarısız oldu"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Paket kurulumu başarısız oldu:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Ä°ÅŸ istasyonu"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Ofis iÅŸ istasyonu"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Ofis programları: kelime işlemciler (OpenOffice.org Writer, Kword), "
-"OpenOffice.org Calc, Kspread, pdf göstericiler, vb.."
+"Ofis programları: kelime işlemciler (LibreOffice Writer, Kword), LibreOffice "
+"Calc, Kspread, pdf göstericiler, vb.."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Oyun Konsolu"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Eğlence programları: kart oyunları, taktik ve strateji, vb.."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Çoklu ortam konsolu"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Ses ve video çalma/düzenleme uygulamaları"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet konsolu"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -422,205 +536,205 @@ msgstr ""
 "E-posta alışverişi ve haber grubu istemci programları (pine, mutt, tin..) ve "
 "web istemcileri "
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Ağ Makinası (client)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "ssh içeren diğer ağ öğeleri için protokoller"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Sisteminizin ayarlarını düzenleyecek uygulama"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsol Araçları"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Metin düzenleyiciler, kabuklar, dosya araçları, terminaller"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "GeliÅŸtirme"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C ve C++ geliştirme kütüphaneleri, programlar ve include dosyaları"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Belgeler"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Serbest Yazılım ve Linux üzerine Kitaplar ve Nasıl belgeleri"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standartları Temeli. Üçüncü parti uygulama desteği"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Web Sunucu"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Grup"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Sunucu"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Güvenlik Kalkanı/Router"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet ağ geçidi"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Posta/Haber"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix posta sunucu, Inn haber sunucu"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Dizin Sunucusu"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP sunucusu"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Alan adı ve Ağ Bilgileri Sunucusu"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Dosya ve Yazdırma  Paylaşım Sunucusu"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS sunucu, Samba sunucu"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Veritabanı"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL veya MySQL veritabanı sunucusu"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL veya MariaDB veritabanı sunucusu"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache ve Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Posta"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix posta sunucu"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL veya MySQL veritabanı sunucusu"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL veya MariaDB veritabanı sunucusu"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Ağ Makinası sunucusu"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS sunucusu, SMB sunucusu, Vekil Sunucu, ssh Sunucu"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafik Ortamı"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE Ä°ÅŸ istasyonu"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE Masaüstü Ortamı, temel grafik ortamla birlikte birleşik araçlar"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME Ä°ÅŸ istasyonu"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -628,66 +742,124 @@ msgid ""
 msgstr ""
 "Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip görsel bir ortam "
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "XFCE Ä°ÅŸ istasyonu"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip hafif bir görsel "
+"bir ortam "
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "MATE Ä°ÅŸ istasyonu"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Cinnamon Ä°ÅŸ istasyonu"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "GNOME temelli bir grafik ortamı"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "LXQT Masaüstü"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr "Yeni nesil QT ile derlenmiş hafif masaüstü ortamı"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Enlightenment e17 Masaüstü"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr "Bunlara özgülenmiş hızlı ve hafif bir görsel ortam"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE Masaüstü"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Hafif ve hızlı bir grafiksel ortam"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasma Masaüstü"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip hafif bir görsel "
-"ortam"
+"Plasma Masaüstü, yardımcı araçlar ile birlikte gelen temel grafiksel ortam"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Diğer Görsel Masaüstleri"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, v.b."
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Araçlar"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Sunucu"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin Uzak Yapılandırma Sunucusu"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Ağ Araçları/İzleme"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "İzleme araçları, işlem sayımı, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia Sihirbazları"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Sunucuyu yapılandırmak için Sihirbazlar"
@@ -701,7 +873,7 @@ msgstr ""
 "Bir hata oluştu, ancak sebebi saptanamadı.\n"
 "Devam edebilirsiniz, ama risk size ait!"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -721,250 +893,251 @@ msgstr "`%s' adımına başlanıyor\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux Kurulum %s"
+msgid "%s Installation %s"
+msgstr "%s Kurulum %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "gezinmek için <Tab>/<Alt-Tab>"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg sunucusunun başlaması yavaş. Lütfen bekleyin..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Sistem kaynaklarınız kısıtlı. Mageia Linux'yi kurarken sorunlarınız\n"
+"Sistem kaynaklarınız kısıtlı. %s'yi kurarken sorunlarınız\n"
 "olabilir. Bu durum oluşursa, metin tabanlı kurulumu deneyebilirsiniz.\n"
 "Bunun için CDROM'dan açtıktan sonra `F1'e basın, ve komut satırına\n"
 "`text' yazın."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr "Paket Grubu Seçimi"
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "Mageia KDE Masaüstünü Kur"
+msgid "Install %s KDE Desktop"
+msgstr "%s KDE Masaüstünü Kur"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "Mageia GNOME Masaüstünü Kur"
+msgid "Install %s GNOME Desktop"
+msgstr "%s GNOME Masaüstünü Kur"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "KiÅŸisel kurulum"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE Masaüstü"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME Masaüstü"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Kişisel Masaüstü"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "'%s' masaüstünün ön izlemesini burada görebilirsiniz."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Daha büyük ön izlemeler görebilmek için resim üzerine tıklayın"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Paket Grubu Seçimi"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Tek tek paket seçimi"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Toplam boyut: %d / %d MB"
+msgid "Unselect All"
+msgstr "Tümünü Seçimden Çıkar"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Hatalı paket"
+msgid "Total size: %d / %d MB"
+msgstr "Toplam boyut: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Sürüm: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Boyut: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Önem: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Bu paket seçimlik değildir"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s paketinin kayıplığından"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s' den dolayı yetersiz"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s yükseltmesi deneniyor"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s'i korumak için"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Yeterli yeriniz kalmadığından bu paketi seçemezsiniz"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Aşağıdaki paketler kurulacaktır"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Aşağıdaki paketler sistemden silinecektir"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Bu zorunlu bir pakettir, seçmemek olmaz"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Bu paketi seçimlerinizden çıkaramazsınız. Zaten kurulmuş."
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Bu paketi seçimlerinizden çıkaramazsınız. Yükseltilmek zorunda"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Kendiliğinden seçilen paketleri göster"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Kur"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Seçimi kaydet/yükle"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Paket seçimini güncelleniyor"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "En ufak kurulum"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Yazılım Yöneticisi"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Kurmak istediğiniz paketleri seçin"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Kuruluyor"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Ayrıntısız"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Kalan süre :"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(tahminen...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
-msgstr[0] "%d paket"
+msgstr[0] "%d adet paket"
+msgstr[1] "%d adet paket"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Özet"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Yapılandır"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "yapılandırılmamış"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Paket Grubu Seçimi"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -973,86 +1146,84 @@ msgstr ""
 "Şu kurulum medyası bulundu.\n"
 "Bu bazılarını geçmek isterseniz, şimdi seçimden çıkarabilirsiniz."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Kurulumdan önce CD'lerin içeriğini sabit diskinize kopyalayabilirsiniz.\n"
-"Sabit diskten kruluma devam edilecek ve paketler sistem tamamen kurulduÄŸunda "
-"da hazır olacaktır."
+"Sabit diskten kuruluma devam edilecek ve paketler sistem tamamen "
+"kurulduğunda da hazır olacaktır."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "CD'lerin tamamını kopyala"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Bir hata oluÅŸtu"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Lütfen klavye düzeninizi seçiniz"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Mevcut tüm klavye düzenlerinin listesi:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Kur/Yükselt"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Bu bir yükleme mi yoksa yükseltme mi ?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
-msgstr ""
-"_: This is a noun:\n"
-"Kurulum"
+msgstr "Kurulum"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s Yükselt"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s için Parola"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Kurulumu iptal et, sistemi yeniden baÅŸlat"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Yeni Kurulum"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Önceki kurulumu güncelle (önerilmez)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1060,48 +1231,26 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Kurulum aracı, halihazırda kurulu olan Mageia Linux sisteminizin güvenli "
-"bir\n"
-"
biçimde %s sistemine yükseltilemeyeceğini algıladı.\n"
-"
\n"
-"
Önceki kurulumunuzun yerini alacak yeni bir kurulum önerilir.\n"
-"
\n"
-"
Uyarı: \"Yeni Kurulum\"u seçmeden önce tüm kişisel verilerinizi "
+"Kurulum aracı, halihazırda kurulu olan Mageia sisteminizin güvenli bir\n"
+"biçimde %s sistemine yükseltilemeyeceğini algıladı.\n"
+"\n"
+"Önceki kurulumunuzun yerini alacak yeni bir kurulum önerilir.\n"
+"\n"
+"Uyarı: \"Yeni Kurulum\"u seçmeden önce tüm kişisel verilerinizi "
 "yedeklemeniz\n"
-"
önerilir."
+"önerilir."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE yapılandırması"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-" 1 MB lık önyükleme bölümünün oluşturulması için disk başlangıcında yeterli "
-"alan yok! Kurulum devam edecektir fakat açılış için DiskDrake'i kullanarak "
-"bir önyükleme disk bölümü oluşturmanız gerekecek"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"PPC PReP Boot ön yükleme alanı oluşturacaksınız! Kurulum devam edecek; ancak "
-"açılış için DiskDrake'i kullanarak bir önyükleme disk bölümü oluşturmanız "
-"gerekecek"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1114,12 +1263,12 @@ msgstr ""
 "\"%s\" etiketli Cd-Rom'u sürücüye takın ve TAMAM'a basın.\n"
 "Eğer Cd-Rom elinizde yoksa bu Cd-Rom'dan kurmamak için VAZGEÇ'e basın."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Mevcut paketler taranıyor"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1127,7 +1276,7 @@ msgid ""
 msgstr ""
 "Sisteminizde kurulum veya yükseltme için yeterli alan yok (% dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1136,52 +1285,52 @@ msgstr ""
 "Lütfen paket seçimini yükle veya kaydete tıklayınız.\n"
 "Otomatik kurulum dosyaları ile aynı biçemde oluşturulacaktır."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Yükle"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Kaydet"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Dosya hatalı"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Masaüstü Seçimi"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "İş istasyonu masaüstü profili seçebilirsiniz."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Seçilen boyut boş disk alanından daha büyük"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Kurulum türü"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1190,87 +1339,115 @@ msgstr ""
 "Seçilmiş bir paket grubu yok\n"
 "Lütfen isteğinize uyan ve en az yer kaplayacak kurulumu seçin:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X ile"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
+msgid "Install recommended packages"
 msgstr "Önerilen paketleri kur"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Temel belgeler olsun (önerilir!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Gerçekten en küçük kurulum (özellikle urpmi yok)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Yükseltme hazırlanıyor..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Kurulum hazırlanıyor"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s paketi kuruluyor"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Paketler düzenlenirken bir hata oluştu:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Yine de devam edilsin mi?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Yeniden Dene"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Bu paketi geç"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\" medyasından tüm paketleri geç."
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Medya ve paket seçimine geri dön."
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Paket %s kurulurken bir hata oluÅŸtu."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Kurulum sonrası yapılandırma"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Lütfen Update Module medyasının %s sürcüsünde olduğuna emin olun"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Güncellemeler"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Şimdi çevrimiçi ortam ayarlama fırsatınız var."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Bu sayede güvenlik güncellemelerini edinebileceksiniz."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Bu ortamları ayarlamak için çalışan bir İnternet bağlanısına \n"
+"ihtiyacınız var.\n"
+"\n"
+"Güncelleme ortamını ayarlamak istiyor musunuz?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1294,28 +1471,29 @@ msgstr ""
 "\n"
 "Güncellemeleri kurmak istiyor musunuz ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s üstündeki %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Donanım"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Ses Kartı"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Bir ISA ses kartınız var mı?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1324,80 +1502,68 @@ msgstr ""
 "Ses kartınızı yapılandırmak için kurulumdan sonra \"sndconfig\" aracını "
 "çalıştırın."
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Ses kartı bulunamadı. Kurulumdan sonra \"harddrake\" ile deneyin."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafiksel arabirim"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "AÄŸ & Ä°nternet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Vekil Sunucular"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "yapılandırıldı"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Güvenlik Seviyesi"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Güvenlik Duvarı"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "etkinleÅŸtirilmiÅŸ"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "pasifleÅŸtirilmiÅŸ"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "X'i yapılandırmadınız. Bunu yapmak istediğinizden emin misiniz?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Önyükleyici hazırlanıyor"
+msgid "Preparing initial startup program..."
+msgstr "Birincil başlangıç uygulaması hazırlanıyor..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Sabredin, bu biraz zaman alabilir..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Çok eski ya da bilinmeyen bir makinaya sahipmişsiniz gibi görünüyor. Yaboot "
-"önyükleyicisi düzgün çalışmayacaktır.Kurulum devam edecek ama bu makinayı "
-"açmak için BootX veya benzeri araçlar kullanmak zorunda kalacaksınız. root "
-"fs için kernel argümanı: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1406,17 +1572,17 @@ msgstr ""
 "Bu güvenlik seviyesinde, Windows bölümündeki dosyalara erişim yönetici "
 "lehine kısıtlanmıştır."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "%s sürücüsüne boş bir disket yerleştirin"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Otomatik kurulum disketi hazırlanıyor"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1427,12 +1593,12 @@ msgstr ""
 "\n"
 "Gerçekten çıkmak istiyormusunuz?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Tebrikler"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Yeniden baÅŸlat"
@@ -1527,13 +1693,6 @@ msgid ""
 "Users"
 msgstr "Kullanıcılar"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "AÄŸ"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1576,34 +1735,5 @@ msgid ""
 "Exit"
 msgstr "Çıkış"
 
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Ofis programları: kelime işlemciler (kword, abiword), kspread, gnumeric, "
-#~ "pdf göstericiler, vb.."
-
-#~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
-#~ msgstr ""
-#~ "Sisteminizi %s sistemine yükseltmeyi tercih ettiniz. Sisteminizde KDE "
-#~ "3.5\n"
-#~ "
algılandı. Bu kurulum aracı bir yükseltmede KDE 3.5 masaüstünün "
-#~ "özelliklerini 
olduğu gibi koruyamaz. Devam etmeyi seçerseniz,\n"
-#~ "
KDE 4, KDE 3' ün yerini alacak ve kişisel KDE yapılandırma ayarlarınızı "
-#~ "kaybedeceksiniz.\n"
-#~ "
KDE 3.5 ile yükseltmek ve kişisel ayarlarınız saklamak isterseniz,\n"
-#~ "
lütfen sisteminizi yeniden başlatarak Mandriva güncelleme programcığını "
-#~ "kullanmak 
suretiyle yükseltme yapın."
-
-#~ msgid "Proceed"
-#~ msgstr "Onayla"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "[%s] getirilemedi"
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Önyükleyici hazırlanıyor"
diff --git a/perl-install/install/share/po/uk.po b/perl-install/install/share/po/uk.po
index d46103059..bf195dd61 100644
--- a/perl-install/install/share/po/uk.po
+++ b/perl-install/install/share/po/uk.po
@@ -1,63 +1,80 @@
-# translation of DrakX.po to ukrainian
-# $Id: uk.po 26602 2006-04-22 07:43:48Z fwang $
-# Copyright (C) 2000,2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2013 Mageia developers
+# This file is distributed under the same license as the drakx package.
 #
-#
-# Dmytro  Kovalov <kov@tokyo.email.ne.jp>, 2000.
-# Taras Boychuk <btr1@torba.com>, 2003, 2004.
-# Taras Boychuk <btr1@mail.ru>, 2004, 2003.
-# Taras Boychuk <btr1@ukrpost.net>, 2004, 2005.
-# Taras Boychuk <btr0001@ukr.net>, 2008, 2009, 2010.
-# Serge A. Ribalchenko <fisher@tpaba.org.ua>, 2008.
-# Yuri Chornoivan <yurchor@ukr.net>, 2008, 2009.
+# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2012, 2013, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: drakx_install\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2010-03-14 11:22-0400\n"
-"Last-Translator: Taras Boychuk <btr0001@ukr.net>\n"
-"Language-Team: Ukrainian <translation@linux.org.ua>\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 07:09+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr "Долучайте�� до на�!"
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr "Підлаштуйте �и�тему під �ебе!"
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr "Вибір за вами!"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Ваша �тільниц� на при�трої USB"
+msgid "Office tools"
+msgstr "Офі�ні ін�трументи"
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "Ди�трибутив Mageia Linux зі 100%% вільного програмного забезпеченн�"
+msgid "Home entertainment"
+msgstr "Домашн� розважальна �и�тема"
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "З Linux про�то ознайомити�� за допомогою Mageia One"
+msgid "For kids"
+msgstr "Дл� дітей"
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Повноцінна �тільниц� Mageia Linux з підтримкою"
+msgid "For family!"
+msgstr "Дл� �ім’ї!"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: ди�трибутиви дл� будь-�ких потреб"
+msgid "For developers!"
+msgstr "Дл� розробників!"
 
-#: any.pm:109
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr "Д�куємо!"
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr "Будьте вільними!"
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Ви маєте на�тупні додаткові но�ії?"
+msgstr "Чи маєте ви до�туп до вказаних нижче додаткових но�іїв?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -68,119 +85,199 @@ msgstr ""
 "Впродовж в�тановленн� знайдено і буде викори�тано на�тупне джерело: %s.\n"
 "\n"
 "\n"
-"Ви маєте ди�к підтримки дл� налаштуванн�?"
+"Чи маєте ви ди�к підтримки дл� налаштуванн�?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Мережа (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Мережа (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Мережа (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "По�иланн� на дзеркало?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "По�иланн� має починати�� з ftp:// або http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Зв'�зую�ь з веб-�айтом Mageia Linux, щоб отримати �пи�ок на�вних джерел..."
+"В�тановленн� зв’�зку з веб-�айтом %s дл� отриманн� �пи�ку до�тупних дзеркал…"
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Помилка зв'�зку з веб-�айтом Mageia Linux, щоб отримати �пи�ок на�вних "
-"джерел..."
+"�е вдало�� в�тановити зв’�зок з веб-�айтом %s дл� отриманн� �пи�ку до�тупних "
+"дзеркал"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Виберіть �ервер, з �кого звантажити пакунки"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "В�тановленн� NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Введіть назву машини або теку з но�ієм NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "�емає назви машини"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
-msgstr "Тека повинна починати�� з \"/\""
+msgstr "�азва каталогу має починати�� з «/»"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "�азва комп'ютера дл� монтуванн� NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
-msgstr "Тека"
+msgstr "Каталог"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Додатковий"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr ""
-"�еможливо знайти перелік пакунків на цьому дзеркалі. Переконайте��, чи "
-"правильне розташуванн�."
+"�а цьому дзеркалі не вдало�� знайти перелік пакунків. Переконайте��, що його "
+"розташуванн� вказано правильно."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr "О�новне (випу�к)"
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr "Сумнівні (випу�к)"
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr "�евільні (випу�к)"
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+"Дл� роботи ча�тини обладнанн� на вашому комп’ютері �лід в�тановити "
+"мікропрограми з закритим кодом, потрібні дл� роботи драйверів з відкритим "
+"кодом."
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "Вам �лід уможливити в�тановленн� зі �ховища «%s»"
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+"У �ховищі «%s» мі�т�ть�� різноманітні ча�тини операційної �и�теми та її "
+"програм"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+"У �ховищі «%s» мі�т�ть�� пакунки з програмним забезпеченн�м, �ке не є "
+"вільним.\n"
+
+#: any.pm:477
+#, 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…)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+"У �ховищі «%s» мі�т�ть�� пакунки з програмним забезпеченн�м, �ке не можна "
+"вільно поширювати у де�ких країнах через порушенн� патентних прав на це "
+"програмне забезпеченн�."
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+"Також у �ховищі «%s» мі�т�ть�� пакунки, �кі зібрано з додатковими "
+"можливо�т�ми, викори�танн� �ких обмежуєть�� патентним законодав�твом."
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "Тут ви можете увімкнути додаткові �ховища, �кщо це вам потрібно."
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "У цьому �ховищі мі�т�ть�� оновленн� пакунків зі �ховища «%s»"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
-msgstr "Перегл�даєть�� �пи�ок вже в�тановлених пакунків..."
+msgstr "Перегл�даєть�� �пи�ок вже в�тановлених пакунків…"
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
-msgstr "Шукаю пакунки дл� поновленн�..."
+msgstr "Шукаємо пакунки дл� поновленн�…"
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
-msgstr "Вилученн� пакунків перед поновленн�м..."
+msgstr "Вилучаємо пакунків перед поновленн�м…"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -189,92 +286,92 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 "�а�тупні пакунки будуть вилучені, щоб забезпечити поновленн�\n"
-"Вашої �и�теми: %s\n"
+"вашої �и�теми: %s\n"
 "\n"
 "\n"
 "Ви �правді хочете вилучити ці пакунки?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Помилка при читанні файла %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "�азву на�тупних ди�ків було змінено:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (попередн� назва %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Мережа"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Будь ла�ка, виберіть но�ій"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
-msgstr "Файл вже і�нує. Перепи�ати?"
+msgstr "Файл вже і�нує. Перезапи�ати його?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "До�туп заборонено"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "�еправильна назва NFS"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
-msgstr "Поганий но�ій %s"
+msgstr "Пошкоджений но�ій %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
-msgstr "�е можу робити знімки екрану перед розбитт�м на розділи"
+msgstr "�е можна робити знімки екрана перед розбитт�м на розділи"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "Знімки екрану �тануть можливими пі�л� в�тановленн� в %s"
+msgstr "Знімки екрана �тануть можливими пі�л� в�тановленн� до %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "В�тановленн�"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
-msgstr "Конфігураці�"
+msgstr "�алаштовуванн�"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Вам потрібно також відформатувати %s"
@@ -285,10 +382,10 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"Де�кі з апаратних за�обів на комп'ютері вимагають драйверів\n"
-"фірм-виготовлювачів дл� того, щоб працювати правильно. \n"
+"Де�кі з апаратних за�обів на вашому комп'ютері вимагають драйверів\n"
+"фірм-виробників дл� того, щоб працювати правильно. \n"
 "\n"
-"Ви можете знайти потрібну інформацію про них на: %s"
+"Ви можете знайти потрібну інформацію про них на �торінці %s"
 
 #: interactive.pm:22
 #, c-format
@@ -300,22 +397,22 @@ msgstr "Вмикаю мережу"
 msgid "Bringing down the network"
 msgstr "Вимикаю мережу"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Зачекайте, перевір�єть�� файл"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "неможливо додати но�ій"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Копіюванн� де�ких пакунків на ди�ки дл� пізнішого викори�танн�"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Триває копіюванн�"
@@ -345,285 +442,311 @@ msgstr "гарно"
 msgid "maybe"
 msgstr "можливо"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "Отриманн� даних щодо пакунків з метаданих у форматі XML…"
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Дл� джерела «%s» немає xml-info. Отримано лише ча�тковий результат дл� "
+"пакунка %s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "�емає опи�у"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
-"Де�кі пакунки, необхідні дл� %s, неможливо в�тановити:\n"
+"Де�кі пакунки, необхідні дл� варіанта %s, неможливо в�тановити:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Стала�� помилка:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Стала�� невиправна помилка: %s"
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "Більше не питати"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d запит на в�тановленн� завершив�� невдало"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "В�тановленн� пакунку невдале:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Робоча �танці�"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Офі�на робоча �танці�"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Програми дл� офі�у: тек�тові проце�ори (OpenOffice.org Writer, Kword), "
-"електронні таблиці (OpenOffice.org Calc, Kspread), перегл�дачі файлів PDF, "
-"тощо"
+"Програми дл� офі�у: тек�тові проце�ори (LibreOffice Writer, Kword), "
+"електронні таблиці (LibreOffice Calc, Kspread), перегл�дачі файлів PDF, тощо"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Ігрова �танці�"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Програми дл� розваг: ігри-перегони, ігри на дошці, �тратегічні, тощо"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Мультимедійна �танці�"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Звукові та відео програвачі та редактори"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Станці� дл� Інтернету"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
 "�абір за�обів дл� читанн� та передаванн� електронної пошти та груп новин "
-"(pine, mutt, tin..), та дл� перегл�ду інформаційних тенет"
+"(pine, mutt, tin…), а також дл� перегл�ду �торінок інтернету"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Мережевий комп'ютер (клієнт)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клієнти дл� різних протоколів (ssh включно)"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "За�оби дл� полегшенн� налаштуванн� комп'ютера"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "За�оби дл� кон�олі"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Розробка"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Документаці�"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
-msgstr "Книжки та ЯК ЗРОБИТИ про Лінак� та вільне програмне забезпеченн�"
+msgstr "Книжки та поради з Linux та вільного програмного забезпеченн�"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
-msgstr "Стандартна база Лінак�. Підтримка програм �торонніх виробників"
+msgstr "Стандартна база Linux. Підтримка програм �торонніх виробників"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Веб-�ервер"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Групова робота"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Сервер Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Захи�ний шлюз/Маршрутизатор"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Інтернет-шлюз"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Пошта/�овини"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Поштовий �ервер postfix, �ервер новин Inn"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Сервер тек"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Сервер FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Сервер назв домену і мережевий інформаційний �ервер"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Сервер до�тупу до файлів і друкарок"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "База даних"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Сервери баз даних PostgreSQL і MySQL "
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Сервери баз даних PostgreSQL і MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Тенета/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Поштовий �ервер postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Сервери баз даних PostgreSQL або MySQL "
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Сервери баз даних PostgreSQL або MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Мережевий комп'ютер (�ервер)"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Графічне �ередовище"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Робоча �танці� KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
-"Робоче �ередовище K (KDE) - о�новне графічне �ередовище з набором допоміжних "
+"Робоче �ередовище K (KDE) — о�новне графічне �ередовище з набором допоміжних "
 "за�обів"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Робоча �танці� Gnome"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -631,66 +754,127 @@ msgid ""
 msgstr ""
 "Графічне �ередовище з дружнім інтерфей�ом та програмами, за�оби дл� �тільниці"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Робоча �танці� XFCE"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Полегшене графічне �ередовище з дружнім інтерфей�ом та програмами, за�оби "
+"дл� �тільниці"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "Робоча �танці� MATE"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Робоча �танці� Cinnamon"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Графічне �ередовище на о�нові GNOME"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "Стільниц� LXQT"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+"�а�тупне поколінн� портованого на Qt швидкого, невибагливого до ре�ур�ів "
+"графічного �ередовища"
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Стільниц� Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Швидке, невибагливе до ре�ур�ів графічне �ередовище з відданими прихильниками"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "Стільниц� LXDE"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "Швидке, невибагливе до ре�ур�ів графічне �ередовище"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Стільниц� Плазми"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Легке і швидке графічне �ередовище з дружнім інтерфей�ом та програмами, "
-"за�оби дл� �тільниці"
+"Стільниц� Плазми — о�новне графічне �ередовище з набором допоміжних за�обів"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Інші графічні �тільниці"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, тощо"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, тощо"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Ін�трументи"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
-msgstr "Сервер SSH "
+msgstr "Сервер SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Сервер віддаленого налаштуванн� Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Мережеві ін�трументи/Слідкуванн� за мережею"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
-msgstr "Ін�трументи дл� �лідкуванн�, облік проце�ів, tcpdump, nmap, ..."
+msgstr "Ін�трументи дл� �лідкуванн�, облік проце�ів, tcpdump, nmap…"
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Помічники Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Помічники дл� налаштуванн� �ервера"
@@ -701,10 +885,10 @@ msgid ""
 "An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"Стала�� помилка, але � не знаю, �к її обробити.\n"
-"Продовжуйте на вла�ний ризик."
+"Стала�� помилка, але �по�іб належного у�уванн� її на�лідків невідомий.\n"
+"Ви можете ризикнути і продовжити в�тановленн�."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -713,351 +897,353 @@ msgid ""
 "\"\n"
 msgstr ""
 "Де�кі важливі пакунки не вдало�� правильно в�тановити. Ваш\n"
-"компакт-ди�к або привід не�правні. Перевірте компакт-ди�к\n"
-"командою \"rpm -qpl media/main/*.rpm\" \n"
+"компакт-ди�к або при�трій дл� його читанн� пошкоджено.\n"
+"Перевірте компакт-ди�к командою \"rpm -qpl media/main/*.rpm\"\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
 msgid "Entering step `%s'\n"
-msgstr "Починаєть�� крок `%s'\n"
+msgstr "Починаєть�� крок «%s»\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "В�тановленн� Мандріва Лінак� %s"
+msgid "%s Installation %s"
+msgstr "В�тановленн� %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> між елементами"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
-msgstr "Сервер Xorg �тартує повільно. Зачекайте..."
+msgstr "Сервер Xorg �тартує повільно. Зачекайте…"
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Си�тема має замало ре�ур�ів. Ви можете мати проблеми з в�тановленн�м\n"
-"Мандріва лінак�а. Якщо це �танеть��, можете �пробувати в�тановленн� в\n"
-"тек�товому режимі. Дл� цього під ча� завантаженн� з компакт-ди�ку\n"
-"нати�ніть F1 і потім введіть \"text\"."
+"Ваша �и�тема не є до�татньо потужною. У ва� можуть виникнути проблеми\n"
+"зі в�тановленн�м %s. Якщо такі проблеми виникнуть, �пробуйте в�тановити\n"
+"�и�тему у тек�товому режимі. Щоб зробити це, нати�ніть F1 під ча� "
+"завантаженн�\n"
+"з компакт-ди�ка, а потім введіть «text»."
+
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr "Вибір но�і�"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "В�тановити робочу �танцію Mageia KDE"
+msgid "Install %s KDE Desktop"
+msgstr "В�тановити робочу �танцію %s KDE"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "В�тановити робочу �танцію Mageia GNOME"
+msgid "Install %s GNOME Desktop"
+msgstr "В�тановити робочу �танцію %s GNOME"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Вибіркове в�тановленн�"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "Стільниц� KDE"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Стільниц� GNOME"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
-msgstr "Типова �тільниц�"
+msgstr "�етипова �тільниц�"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
-msgstr "Попередній перегл�д �тільниці '%s'."
+msgstr "Попередній перегл�д �тільниці «%s»."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "�ати�ніть на зображенн�, щоб побачити більший розмір"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Вибір груп пакунків"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Індивідуальний вибір пакунків"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Загальний розмір: %d / %d Мб "
+msgid "Unselect All"
+msgstr "Ска�увати ве�ь вибір"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Поганий пакунок"
+msgid "Total size: %d / %d MB"
+msgstr "Загальний розмір: %d / %d МБ"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Вер�і�: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Розмір: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
-msgstr "%d Кб\n"
+msgstr "%d кБ\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Важливі�ть: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
-msgstr "Ви не можете вибрати або відмінити вибір цього пакунка."
+msgid "You cannot select/unselect this package"
+msgstr "Ви не можете вибрати або �ка�увати вибір цього пакунка."
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "через від�утні�ть %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "через незадоволені�ть %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
-msgstr "пробую активізувати %s"
+msgstr "намагаємо�� заді�ти %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "щоб залишити %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Ви не можете вибрати цей пакунок, бо дл� його в�тановленн� не залишило�� "
 "до�татньо вільного мі�ц�."
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Ці пакунки буде в�тановлено"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "�а�тупні пакунки буде вилучено"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
-msgstr "Цей пакунок необхідний, його вибір відмінити не можна"
+msgid "This is a mandatory package, it cannot be unselected"
+msgstr "Цей пакунок необхідний, його вибір не можна �ка�овувати"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
-msgstr "Вибір цього пакунка неможливо відмінити. Його вже в�тановлено."
+msgid "You cannot unselect this package. It is already installed"
+msgstr "Вибір цього пакунка не можна �ка�овувати. Його вже в�тановлено."
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
-msgstr "Вибір цього пакунка неможливо відмінити. Він повинен бути поновлений."
+msgid "You cannot unselect this package. It must be upgraded"
+msgstr "Вибір цього пакунка не можна �ка�овувати. Його �лід поновити."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Показувати автоматично вибрані пакунки"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "В�тановленн�"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
-msgstr "Завантажити/зберегти виділене"
+msgstr "Завантажити/зберегти позначене"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Поновленн� вибору пакунків"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Мінімальне в�тановленн�"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Менеджер програм"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
-msgstr "Виберіть пакунки, �кі Ви хочете в�тановити"
+msgstr "Виберіть пакунки, �кі ви хочете в�тановити"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
-msgstr "В�тановлюю"
+msgstr "В�тановленн�"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
-msgstr "Загально"
+msgstr "Без подробиць"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Залишило�� ча�у:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
-msgstr "(наближене обчи�ленн�...)"
+msgstr "(наближене обчи�ленн�…)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d пакунок"
 msgstr[1] "%d пакунки"
 msgstr[2] "%d пакунків"
+msgstr[3] "%d пакунків"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
-msgstr "Загалом"
+msgstr "Під�умки"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "�алаштувати"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "не налаштовано"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Вибір но�і�"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 "Було знайдено на�тупні но�ії в�тановленн�.\n"
-"Якщо Ви не хочете викори�товувати де�кі з них, відмініть їх вибір."
+"Якщо ви не хочете викори�товувати де�кі з них, зніміть з них позначку вибору."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
-"У Ва� є можливі�ть перед початком в�тановленн� �копіювати вмі�т компакт-"
+"У ва� є можливі�ть перед початком в�тановленн� �копіювати вмі�т компакт-"
 "ди�ків на твердий ди�к.\n"
-"Пі�л� цього в�тановленн� продовжить�� з твердого ди�ку і пакунки залишать�� "
+"Пі�л� цього в�тановленн� продовжить�� з твердого ди�ка і пакунки залишать�� "
 "до�тупними пі�л� повного в�тановленн� �и�теми."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Копіювати компакт-ди�ки повні�тю."
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Стала�� помилка"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Будь ла�ка, виберіть розкладку клавіатури"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Тут наведено повний �пи�ок можливих мап клавіатури:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
-msgstr "В�тановити/Оновити"
+msgstr "В�тановити/Поновити"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "Це в�тановленн� чи оновленн�?"
+msgstr "Це в�тановленн� чи поновленн�?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "В�тановленн�"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
-msgstr "Оновити %s"
+msgstr "Поновити %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Ключ шифруванн� дл� %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Припинити в�тановленн�, перезавантажити �и�тему."
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "�ове в�тановленн�"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
-msgstr "Оновити попереднє в�тановленн� (не рекомендуєть��)"
+msgstr "Поновити попереднє в�тановленн� (не рекомендуєть��)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1065,46 +1251,25 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"Програма в�тановленн� ви�вила, що раніше в�тановлена �и�тема\n"
-"Mageia Linux не може бути безпечно оновлена до %s.\n"
+"Програма дл� в�тановленн� ви�вила, що раніше в�тановлена �и�тема\n"
+"Mageia Linux не може бути безпечно поновлена до %s.\n"
 "\n"
 "Рекомендуєть�� виконати нове в�тановленн� �и�теми, �ке замінить попереднє.\n"
 "\n"
-"Попередженн� : потрібно зробити резервну копію о�оби�тих даних\n"
-"перед тим, �к виберете \"�ове в�тановленн�\"."
+"Попередженн�: вам �лід зробити резервну копію о�оби�тих даних\n"
+"перед тим, �к виберете «�ове в�тановленн�»."
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "�алаштуванн� IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"�е ви�тачає вільного мі�ц� дл� 1МБ завантажувального блоку! В�тановленн�\n"
-"буде продовжувати�ь, але дл� завантаженн� �и�теми потрібно\n"
-"буде �творити DiskDrake'ом завантажувальний розділ"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Вам потрібно �творити початковий завантажувач PPC PReP Boot! В�тановленн� "
-"буде продовжувати�ь, але дл� завантаженн� �и�теми потрібно буде �творити "
-"DiskDrake'ом завантажувальний розділ"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1113,26 +1278,26 @@ msgid ""
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "Змініть компакт-ди�к!\n"
-"Будь ла�ка, в�тавте компакт-ди�к, позначений \"%s\" у при�трій і\n"
-"нати�ніть Гаразд пі�л� цього.\n"
-"Якщо Ви не маєте такого ди�ку, нати�ніть Ска�увати, щоб не\n"
-"в�тановлювати з нього."
+"Будь ла�ка, в�тавте компакт-ди�к з міткою «%s» у при�трій і\n"
+"нати�ніть «Гаразд».\n"
+"Якщо ви не маєте такого ди�ка, нати�ніть Ска�увати, щоб не\n"
+"в�тановлювати з цього ди�ка."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
-msgstr "Шукаю на�вні пакунки..."
+msgstr "Шукаю на�вні пакунки…"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
-"В �и�темі не залишило�� до�татньо мі�ц� дл� в�тановленн� або оновленн� (%dМб "
-"> %dМб)"
+"У вашій �и�темі не залишило�� до�татньо мі�ц� дл� в�тановленн� або "
+"поновленн� (%dМб > %dМб)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1141,141 +1306,169 @@ msgstr ""
 "Будь ла�ка, виберіть, завантажити чи запи�ати вибір пакунків.\n"
 "Формат такий �амий, �к дл� файлів auto_install."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Завантаженн�"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Зберегти"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Поганий файл"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Вибір �тільниці"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Ви можете вибрати профіль �тільниці робочої �танції."
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Вибраний розмір більший за на�вний "
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Тип в�тановленн�"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 "Ви не вказали жодної групи пакунків.\n"
-"Будь ла�ка, вкажіть мінімальне в�тановленн�, �ке Ви хочете:"
+"Будь ла�ка, вкажіть мінімальний варіант в�тановленн�:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Разом з Х"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "В�тановити запропоновані пакунки"
+msgid "Install recommended packages"
+msgstr "В�тановлювати запропоновані пакунки"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
-msgstr "З о�новною документацією (рекомендуєть��!)"
+msgstr "З о�новною документацією (рекомендуємо!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "�а�правді мінімальне в�тановленн� (навіть без urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "Готуємо�� до оновленн�…"
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Підготовка в�тановленн�"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "В�тановлюєть�� пакунок %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Стала�� помилка під ча� �ортуванн� пакунків: "
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "В�е-таки продовжувати?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Ще раз"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Пропу�тити цей пакунок"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
-msgstr "Пропу�тити у�і пакунки з но�і� \"%s\""
+msgstr "Пропу�тити у�і пакунки з но�і� «%s»"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Повернути�� до вибору но�іїв і пакунків"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Стала�� помилка під ча� в�тановленн� пакунка %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "�алаштуванн� пі�л� в�тановленн�"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Переконайте��, чи джерело Update Modules знаходить�� в но�ії %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Поновленн�"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "Тепер ви можете налаштувати мережеві �ховища пакунків."
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "Це надає змогу в�тановлювати оновленн� безпеки."
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"Дл� налаштовуванн� �ховищ пакунків вам знадобить�� працездатне \n"
+"інтернет-з’єднанн�.\n"
+"\n"
+"Хочете налаштувати �ховище пакунків дл� оновленн�?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1287,37 +1480,38 @@ msgid ""
 "\n"
 "Do you want to install the updates?"
 msgstr ""
-"Зараз Ви маєте можливі�ть звантажити поновлені пакунки. Ці пакунки\n"
-"було поновлено пі�л� виходу ди�трибутиву. Вони можуть мі�тити\n"
+"Зараз ви маєте можливі�ть звантажити поновлені пакунки. Ці пакунки\n"
+"було поновлено пі�л� виходу ди�трибутива. Вони можуть мі�тити\n"
 "виправленн� безпеки або помилок.\n"
 "\n"
-"Щоб звантажити ці пакунки, потрібно мати працююче з'єднанн� з\n"
-"інтернетом.\n"
+"Щоб звантажити ці пакунки, вам �лід мати працездатне з'єднанн� з\n"
+"Інтернетом.\n"
 "\n"
-"Хочете в�тановити ці поновленн�?"
+"Ви хочете в�тановити ці поновленн�?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
-msgstr "Залізо"
+msgstr "Обладнанн�"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
-msgstr "Звукова плата"
+msgstr "Звукова картка"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
-msgstr "Чи маєте Ви звукові карти ISA?"
+msgstr "Чи маєте ви звукові карти ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1326,99 +1520,87 @@ msgstr ""
 "Виконайте \"alsaconf\" або \"sndconfig\" пі�л� в�тановленн�, щоб налаштувати "
 "звукову карту"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Звукових карт не ви�влено. Спробуйте \"harddrake\" пі�л� в�тановленн�"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Графічний інтерфей�"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
-msgstr "Мережа та інтернет"
+msgstr "Мережа та Інтернет"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Прок�і"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "налаштовано"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Рівень безпеки"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Захи�ний шлюз"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "увімкнено"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "вимкнено"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
-msgstr "Ви не �конфігурували X. Ви впевнені, що дій�но цього хочете?"
+msgstr "Ви не налаштувати X. Ви впевнені, що дій�но цього хочете?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Підготовлюю завантажувач..."
+msgid "Preparing initial startup program..."
+msgstr "Приготуванн� початкової програми запу�ку…"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
-msgstr "Будьте терпеливі, це може тривати довго..."
-
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Здаєть�� у Ва� машина OldWorld чи �евідома. Завантажувач yaboot не буде "
-"працювати з цією машиною. В�тановленн� буде продовжувати�ь, але дл� "
-"завантаженн� потрібно викори�тати BootX чи �кий�ь інший �по�іб завантаженн� "
-"машини. Параметр �дра дл� кореневої файлової �и�теми: root=%s"
+msgstr "Зачекайте, це може тривати довго…"
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
-"�а цьому рівні безпеки до�туп до файлів на розділі Windows дозволено тільки "
+"�а цьому рівні безпеки до�туп до файлів на розділі Windows дозволений тільки "
 "адміні�тратору."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "В�тавте чи�ту ди�кету в ди�ковод %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
-msgstr "Створенн� ди�кети дл� автоматичного в�тановленн�..."
+msgstr "Створенн� ди�кети дл� автоматичного в�тановленн�…"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1429,12 +1611,12 @@ msgstr ""
 "\n"
 "Ви дій�но хочете припинити зараз?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Вітанн�"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Перезавантажити"
@@ -1471,7 +1653,7 @@ msgstr "Миша"
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
-msgstr "Визначенн� твердого ди�ку"
+msgstr "Визначенн� твердого ди�ка"
 
 #: steps_list.pm:21 steps_list.pm:22
 #, c-format
@@ -1520,7 +1702,7 @@ msgstr "Вибір пакунків"
 msgid ""
 "_: Keep these entry short\n"
 "Installing"
-msgstr "В�тановлюю"
+msgstr "В�тановленн�"
 
 #: steps_list.pm:34
 #, c-format
@@ -1529,13 +1711,6 @@ msgid ""
 "Users"
 msgstr "Кори�тувачі"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Робота в мережі"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1555,14 +1730,14 @@ msgstr "�алаштувати X"
 msgid ""
 "_: Keep these entry short\n"
 "Summary"
-msgstr "Загалом"
+msgstr "Під�умки"
 
 #: steps_list.pm:44 steps_list.pm:45
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Services"
-msgstr "Серві�и"
+msgstr "Служби"
 
 #: steps_list.pm:46
 #, c-format
@@ -1576,37 +1751,82 @@ msgstr "Поновленн�"
 msgid ""
 "_: Keep these entry short\n"
 "Exit"
-msgstr "Вийти"
+msgstr "Вихід"
+
+#~ msgid "Preparing bootloader..."
+#~ msgstr "Готуємо завантажувач…"
+
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Легке і швидке графічне �ередовище з дружнім інтерфей�ом та програмами, "
+#~ "за�оби дл� �тільниці"
+
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Стільниц� RazorQT"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "�е ви�тачає вільного мі�ц� дл� 1МБ завантажувального блоку! В�тановленн�\n"
+#~ "буде продовжувати�ь, але дл� завантаженн� �воєї �и�теми вам потрібно\n"
+#~ "буде �творити DiskDrake'ом завантажувальний розділ"
 
 #~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
+#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, "
+#~ "but to boot your system, you'll need to create the bootstrap partition in "
+#~ "DiskDrake"
 #~ msgstr ""
-#~ "Програми дл� офі�у: тек�тові проце�ори (kword, abiword), бухгалтер�ькі "
-#~ "таблиці (kspread, gnumeric), перегл�дачі файлів pdf, тощо"
+#~ "Вам потрібно �творити початковий завантажувач PPC PReP Boot! В�тановленн� "
+#~ "буде продовжувати�ь, але дл� завантаженн� �и�теми потрібно буде �творити "
+#~ "DiskDrake'ом завантажувальний розділ"
 
 #~ msgid ""
-#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
-#~ "you choose to proceed, \n"
-#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
-#~ "configuration settings. \n"
-#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
-#~ "please reboot your system and upgrade using the Mandriva update applet."
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
 #~ msgstr ""
-#~ "Ви вирішили оновити �и�тему до вер�ії %s. В �и�темі було ви�влено\n"
-#~ "в�тановлене �тільничне �ередовище KDE 3.5. Цей ін�трумент в�тановленн� "
-#~ "не\n"
-#~ "може зберегти KDE 3.5 під ча� оновленн�. Якщо Ви вирішите продовжити "
-#~ "проце�, \n"
-#~ "KDE 3 буде замінено на KDE 4, а отже Ви втратите о�оби�ті налаштуванн� "
-#~ "KDE. \n"
-#~ "Щоб оновити KDE 3.5 зі збереженн�м о�оби�тих параметрів, будь ла�ка, \n"
-#~ "перезавантажте �и�тему, а потім виконайте оновленн� за допомогою аплету\n"
-#~ "оновленн� Mandriva."
-
-#~ msgid "Proceed"
-#~ msgstr "Продовжувати"
-
-#~ msgid "retrieval of [%s] failed"
-#~ msgstr "пошук [%s] завершив�� невдачею"
+#~ "Здаєть�� у ва� машина OldWorld чи �евідома. Завантажувач yaboot не буде "
+#~ "працювати з цією машиною. В�тановленн� буде продовжувати�ь, але дл� "
+#~ "завантаженн�, вам �лід викори�тати BootX чи �кий�ь інший �по�іб "
+#~ "завантаженн� вашої машини. Параметр �дра дл� кореневої файлової �и�теми: "
+#~ "root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Вітаємо"
+
+#~ msgid "People!"
+#~ msgstr "в�іх!"
+
+#~ msgid "For people"
+#~ msgstr "Дл� в�іх"
+
+#~ msgid "For contributors"
+#~ msgstr "Дл� уча�ників"
+
+#~ msgid "For you"
+#~ msgstr "Дл� ва�"
+
+#~ msgid "Welcome!"
+#~ msgstr "Вітаємо'"
+
+#~ msgid "Select All"
+#~ msgstr "Вибрати в�е"
+
+#~ msgid "Bad package"
+#~ msgstr "Поганий пакунок"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "Готуємо завантажувач…"
+
+#~ msgid "Mageia, the new Linux distribution"
+#~ msgstr "Mageia, новий ди�трибутив Linux"
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Робота в мережі"
diff --git a/perl-install/install/share/po/uz.po b/perl-install/install/share/po/uz.po
index a8eb11c4d..b4ed8588f 100644
--- a/perl-install/install/share/po/uz.po
+++ b/perl-install/install/share/po/uz.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz@cyrillic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2010-01-07 11:35+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -20,38 +20,63 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Sizning ish stolingiz USB kalitda"
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Idora stansiyasi"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "100%% ochiq kodli Mageia Linux distributivi"
+msgid "For family!"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Mageia One yordamida Linux'ni osongina kashf eting"
+msgid "For developers!"
+msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Toʻliq Mageia Linux ish stoli, qoʻllab-quvvatlash bilan"
+msgid "Thank you!"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: barchaga moʻljallangan distributiv"
+msgid "Be Free!"
+msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Sizda qoʻshimcha kompakt-disk bormi?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -64,93 +89,91 @@ msgstr ""
 "\n"
 "Moslanishi kerak boʻlgan qoʻshimcha oʻrnatish manbasi bormi?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "Kompakt-disk"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Tarmoq (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Tarmoq (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Tarmoq (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Oynaning manzili (URL)"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Manzil ftp:// yoki http:// bilan boshlanishi kerak"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Mavjud boʻlgan oynalarning roʻyxatini olish uchun Mageia Linux sayti bilan "
-"aloqa oʻrnatilmoqda..."
+"Mavjud boʻlgan oynalarning roʻyxatini olish uchun %s sayti bilan aloqa "
+"oʻrnatilmoqda..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Mavjud boʻlgan oynalarning roʻyxatini olish uchun Mageia Linux sayti bilan "
-"aloqa oʻrnatib boʻlmadi"
+"Mavjud boʻlgan oynalarning roʻyxatini olish uchun %s sayti bilan aloqa "
+"oʻrnatib boʻlmadi"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Paketlarni olish uchun oynani tanlang"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS orqali oʻrnatish"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "NFS toʻplamining kompyuter nomini va direktoriyani kiriting"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Kompyuterning nomi koʻrsatilmagan"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Direktoriya \"/\" belgi bilan boshlashi kerak"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS serverining xost nomi"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Direktoriya"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Qoʻshimcha"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -159,23 +182,90 @@ msgstr ""
 "Oynada paketlar roʻyxatini topib boʻlmadi. Manzil (URL) toʻgʻri "
 "koʻrsatilganligini tekshiring."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, fuzzy, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "\"%s\" toʻplamidan hamma paketlarga eʼtibor berilmasin"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Allaqachon oʻrnatilgan paketlar qidirilmoqda..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Yangilash uchun paketlar qidirilmoqda..."
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Yangilashdan avval paketlar olib tashlanmoqda..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -188,88 +278,88 @@ msgstr ""
 "\n"
 "Davom etishni istaysizmi?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s faylini oʻqishda xato roʻy berdi"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Quyidagi disk(lar)ning nomi oʻzgartirildi:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (oldingi nomi %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Tarmoq"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Iltimos toʻplamni tanlang"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fayl allaqachon mavjud. Uni almashtirishni istaysizmi?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Ruxsat yoʻq"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "NFS nomi notoʻgʻri"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Notoʻgʻri toʻplam %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Skrinshotlarni diskni boʻlishdan avval olib boʻlmaydi"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 "Oʻrnatish tugaganidan keyin skrinshotlarni quyidagi joydan topish mumkin: %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Oʻrnatish"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Moslash"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Siz %s'ni ham format qilishingiz kerak"
@@ -293,22 +383,22 @@ msgstr "Tarmoq ishga tushirilmoqda"
 msgid "Bringing down the network"
 msgstr "Tarmoq oʻchirilmoqda"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Iltimos kutib turing, fayl olinmoqda"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "manbani qoʻshib boʻlmadi"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Baʼzi paketlardan diskka nusxa olinmoqda"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Nusxa olish davom etmoqda"
@@ -338,7 +428,22 @@ msgstr "yaxshi"
 msgid "maybe"
 msgstr "balki"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Taʼrif yoʻq"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -347,66 +452,76 @@ msgstr ""
 "%s talab qiladigan baʼzi paketlarni oʻrnatib boʻlmaydi:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Xato roʻy berdi:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Juda jiddiy xato roʻy berdi: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d oʻrnatish tranzaksiyasi muvaffaqiyatsiz tugadi"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Paketlarni oʻrnatib boʻlmadi:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Ish stansiyasi"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Idora stansiyasi"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Idora uchun dasturlar: matn protsessorlari (OpenOffice.org Writer, Kword), "
-"elektron jadvallar (OpenOffice.org Calc, Kspread), PDF koʻruvchilar va hokazo"
+"Idora uchun dasturlar: matn protsessorlari (LibreOffice Writer, Kword), "
+"elektron jadvallar (LibreOffice Calc, Kspread), PDF koʻruvchilar va hokazo"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Oʻyin stansiyasi"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Ovunchoq dasturlar: arkada, stol oʻyinlari, strategiya va hokazo"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedia stansiyasi"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Audio va videoni oʻynash/tahrirlash uchun dasturlar"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet stansiyasi"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -415,205 +530,205 @@ msgstr ""
 "Xat-xabar, yangiliklarni oʻqish va joʻnatish (mutt, tin..) va Internetda "
 "sayr qilish uchun vositalar toʻplami"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Tarmoqdagi kompyuter (klient)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Turli protokollar, shu jumlada SSH, uchun klientlar"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Kompyuterni moslashni yengilashtirish uchun vositalar"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Konsol vositalari"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Tahrirchilar, konsollar, fayl vositalari, terminallar"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Tuzish"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C va C++ tuzish kutubxonalari, vositalar va xeder fayllar"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Qoʻllanmalar"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux va erkin dasturlar haqida kitoblar va Howto'lar"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Uchinchi tomon dastur tuzuvchilari qoʻllanuvi"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Veb-serveri"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab serveri"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Fayervol/Ruter"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet geytveyi"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Xat-xabar/Yangiliklar"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix xat-xabar serveri, Inn yangiliklar serveri"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Direktoriya serveri"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP serveri"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "DNS va NIS"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fayl va printerni boʻlishish serveri"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS serveri, Samba serveri"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Maʼlumot bazasi"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL va MySQL maʼlumot bazasi"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL va MariaDB maʼlumot bazasi"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Xat-xabar"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix xat-xabar serveri"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL yoki MySQL maʼlumot bazasi"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL yoki MariaDB maʼlumot bazasi"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Tarmoqdagi kompyuter (server)"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS serveri, SMB serveri, Proxy serveri, SSH serveri"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafik muhit"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE stansiyasi"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE - vositalar toʻplami bilan birga asosiy grafik muhit"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME stansiyasi"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -622,67 +737,128 @@ msgstr ""
 "Foydalanuvchilar uchun qulay dasturlar va ish stoli vositalaridan iborat "
 "grafik muhit"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE stansiyasi"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Foydalanuvchilar uchun qulay dasturlar va ish stoli vositalaridan iborat "
+"grafik muhit"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME stansiyasi"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Ish stansiyasi"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Grafik muhit"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "LXDE ish stoli"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Foydalanuvchi uchun qulay dasturlar va ish stoli vosilari mavjud boʻlgan "
+"yengil va tez ishlovchi grafik muhit"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE ish stoli"
 
-#: share/meta-task/compssUsers.pl:146
-#, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Foydalanuvchi uchun qulay dasturlar va ish stoli vosilari mavjud boʻlgan "
 "yengil va tez ishlovchi grafik muhit"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Boshqa ish stoli"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "KDE - vositalar toʻplami bilan birga asosiy grafik muhit"
+
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Boshqa grafik ish stollari"
 
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:200
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, va hokazo"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Vositalar"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH serveri"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin masofadan boshqarish serveri"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Tarmoq vositalari/Nazorat qilish"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr ""
 "Nazorat qilish vositalari, vazifalar hisobotchilari, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia yordamchilari"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Serverni moslash uchun yordamchilar"
@@ -696,7 +872,7 @@ msgstr ""
 "Xatolik yuz berdi ammo uning sababi aniqlanmadi.\n"
 "Tavvakkal qilgan holda davom etishingiz mumkin."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -716,253 +892,253 @@ msgstr "%s bosqichga oʻtilmoqda\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux OTni oʻrnatish %s"
+msgid "%s Installation %s"
+msgstr "%s OTni oʻrnatish %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> banddan-bandga"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg dasturi juda sekin ishga tushyapti. Iltimos kutib turing..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Tizimda resurslar yetishmaydi. Mageia Linux tizimini oʻrnatish mobaynida\n"
+"Tizimda resurslar yetishmaydi. %s tizimini oʻrnatish mobaynida\n"
 "muammoga duch kelishingiz mumkin. Agar shunday boʻlsa, matn usulida "
 "oʻrnatish vositasidan foydalanib koʻring,\n"
 "Buning uchun diskdan yuklanayotganda `F1' tugmasini bosing va `text' deb "
 "yozing."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Media Selection"
+msgstr "Manbani tanlash"
+
+#: steps_gtk.pm:253
+#, fuzzy, c-format
+msgid "Install %s KDE Desktop"
 msgstr "KDE ish stoli"
 
-#: steps_gtk.pm:240
-#, c-format
-msgid "Install Mageia GNOME Desktop"
+#: steps_gtk.pm:254
+#, fuzzy, c-format
+msgid "Install %s GNOME Desktop"
 msgstr "GNOME ish stoli"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Boshqa"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE ish stoli"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME ish stoli"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Boshqa ish stoli"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Bu '%s' ish stolining koʻrinishi."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Ish stolini yaqinroqdan koʻrish uchun rasmni sichqoncha bilan bosing"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Paketlarni guruh boʻyicha tanlash"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Paketlarni bittama-bitta tanlash"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Jami: %d / %d Mb"
+msgid "Unselect All"
+msgstr "Hech qaysi tanlanmasin"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Yomon paket"
+msgid "Total size: %d / %d MB"
+msgstr "Jami: %d / %d Mb"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Versiyasi: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Hajmi: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d Kb\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Muhimligi: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Bu paketni tanlolmaysiz/tanlashni bekor qilolmaysiz"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s yetishmagani uchun"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s ativlashtirishga harakat qilinmoqda"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s'ni qoldirish uchun"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Bu paketni tanlolmaysiz, chunki uni oʻrnatish uchun yetarli joy mavjud emas."
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Quyidagi paketlar oʻrnatiladi"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Quyidagi paketlar olib tashlaniladi."
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr ""
 "Bu oʻrnatilishi shart boʻlgan paket, uni tanlashni bekor qilib boʻlmaydi."
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Bu paketni tanlashni bekor qilolmaysiz. U allaqachon oʻrnatilgan."
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Bu paketni tanlashni bekor qilolmaysiz. U yangilanishi shart."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Avtomatik ravishda tanlangan paketlarni koʻrsatish"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Oʻrnatish"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Tanlanganni yuklash/saqlash"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Paketlar tanlovi yangilanmoqda"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal oʻrnatish"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Dasturlar boshqaruvi"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Siz oʻrnatmoqchi boʻlgan paketlarni tanlang"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Oʻrnatilmoqda"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Tafsilotlarsiz"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Qolgan vaqt:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(chamalanmoqda)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d-ta paket"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Hisobot"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Moslash"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "moslanmagan"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Manbani tanlash"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -971,84 +1147,84 @@ msgstr ""
 "Quyidagi oʻrnatish manbalari aniqlandi.\n"
 "Faqat tanlangan manbalar oʻrnatish uchun ishlatiladi."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Oʻrnatishdan avval kompakt-disklardagi paketlardan kompyuterning diskiga "
 "nusxa olish mumkin.\n"
 "Oʻrnatish toʻliq tugagandan soʻng ular tizimga maʼlum boʻladi."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Butun diskdan nusxa olish"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Xato roʻy berdi"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Iltimos tugmalar tartibini tanlang"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Mavjud boʻlgan klaviaturalarning toʻliq roʻyxati:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Oʻrnatish/Yangilash"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Bu oʻrnatishmi yoki yangilashmi?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Oʻrnatish"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s OTni yangilash"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s uchun kodlash kaliti"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Oʻrnatishni bekor qilish, kompyuterni oʻchirib-yoqish"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Oʻrnatish"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Oldingi oʻrnatishni yangilash (tavsiya etilmaydi)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1057,34 +1233,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE'ni moslash"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"1Mblik yuklovchi dastur uchun yetarli joy qolmagan! Oʻrnatish davom etadi "
-"ammo tizimni yuklash uchun DiskDrake'da dastlabki yuklovchi yaratilishi kerak"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1098,12 +1257,12 @@ msgstr ""
 "Agar u sizda boʻlmasa, bu kompakt-diskdan oʻrnatishni bekor qilish uchun "
 "\"Bekor qilish\" tugmasini bosing."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Mavjud boʻlgan paketlar qidirilmoqda..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1111,59 +1270,59 @@ msgid ""
 msgstr ""
 "Tizimda oʻrnatish yoki yangilash uchun yetarli joy qolmadi (%d Mb > %d Mb)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Yuklash"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Saqlash"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Notoʻgʻri fayl"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Ish stolini tanlash"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Quyidagilardan oʻrnatiladigan ish stolini tanlang"
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Tanlangan hajm mavjud boʻlgan boʻsh joydan katta"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Oʻrnatishning turi"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1172,87 +1331,111 @@ msgstr ""
 "Siz hech qanday paketlar guruhini tanlamadingiz.\n"
 "Iltimos siz istagan minimal oʻrnatishni tanlang:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X bilan"
 
-#: steps_interactive.pm:583
-#, c-format
-msgid "Install suggested packages"
+#: steps_interactive.pm:579
+#, fuzzy, c-format
+msgid "Install recommended packages"
 msgstr "Taklif qilingan paketlarni oʻrnatish"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Asosiy qoʻllanmalar bilan (tavsiya qilinadi!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Haqiqiy minimal oʻrnatish (xususan urpmi'siz)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "OT yuklagichi tayyorlanmoqda..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Oʻrnatishga tayyorlanmoqda"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s paketi oʻrnatilmoqda"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Quyidagi paketlarni saralashda xato roʻy berdi:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Bunga qaramasdan davom etishni istaysizmi?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Qaytadan urinish"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Bu paketga eʼtibor berilmasin"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\" toʻplamidan hamma paketlarga eʼtibor berilmasin"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Oʻrnatish manbalarni va paketlarni tanlashga qaytish"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Quyidagi paketni oʻrnatishda xato roʻy berdi: %s"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Oʻrnatishdan keyin moslash"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "%s ichida Update Modules toʻplami mavjudligini tekshirib koʻring"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Yangilanishlar"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1265,7 +1448,7 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Hozir sizda yangilangan paketlarni yozib olib oʻrnatish imkoniyati mavjud.\n"
-"Ular hozir siz oʻrnatgan Mageia Linux tizimi chiqqanidan soʻng\n"
+"Ular hozir siz oʻrnatgan Mageia tizimi chiqqanidan soʻng\n"
 "yangilangan. Ularda har xil xavfsizlik va dasturlar bilan bogʻliq\n"
 "xatoliklar tuzatilgan boʻlishi mumkin.\n"
 "\n"
@@ -1275,28 +1458,29 @@ msgstr ""
 "\n"
 "Yangilanishlarni oʻrnatishni istaysizmi?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s %s'da"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Asbob-uskunalar"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Tovush karta"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Sizda ISA tovush kartasi bormi?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1305,82 +1489,70 @@ msgstr ""
 "Oʻrnatishdan keyin, tovush kartangizni moslash uchun, \"sndconfig\" yoki "
 "\"alsaconf\" dasturini ishga tushiring"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Tovush kartasi topilmadi. Oʻrnatishdan keyin \"harddrake\" dasturini sinab "
 "koʻring."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafik interfeys"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Tarmoq va Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proksilar"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "moslangan"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Xavfsizlik darajasi"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Fayervol"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "ishlayapti"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "oʻchirilgan"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Siz X'ni moslamadingiz. Rostdan buni istaysizmi?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "OT yuklagichi tayyorlanmoqda..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Oʻrnatishga tayyorlanmoqda"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Kutib turing, bu biroz vaqt olishi mumkin..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Kompyuteringiz juda eski rusumga yoki nomaʼlum rusmga oʻxshaydi, shu "
-"sababdan yaboot tizim yuklovchisi ishlamaydi. Oʻrnatish davom etadi ammo "
-"tizimni yuklash uchun BootX yoki boshqa usuldan foydalanishingiz lozim "
-"boʻladi. Root fayl tizimi uchun uchun kernel argumenti: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1389,17 +1561,17 @@ msgstr ""
 "Ushbu xavfsizlik daraja qoʻllanilganda diskning Windows qismidagi fayllarga "
 "faqat administrator murojaat qilishi mumkin."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Boʻsh disketni %s uskunasiga qoʻying"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Avto-oʻrnatish disketi yaratilmoqda..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1410,12 +1582,12 @@ msgstr ""
 "\n"
 "Rostdan chiqishni istaysizmi?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Tabriklaymiz!"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Oʻchirib-yoqish"
@@ -1510,13 +1682,6 @@ msgid ""
 "Users"
 msgstr "Foydalanuvchilar"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Tarmoq"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1559,6 +1724,72 @@ msgid ""
 "Exit"
 msgstr "Chiqish"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "OT yuklagichi tayyorlanmoqda..."
+
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Foydalanuvchi uchun qulay dasturlar va ish stoli vosilari mavjud boʻlgan "
+#~ "yengil va tez ishlovchi grafik muhit"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Boshqa ish stoli"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "1Mblik yuklovchi dastur uchun yetarli joy qolmagan! Oʻrnatish davom etadi "
+#~ "ammo tizimni yuklash uchun DiskDrake'da dastlabki yuklovchi yaratilishi "
+#~ "kerak"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Kompyuteringiz juda eski rusumga yoki nomaʼlum rusmga oʻxshaydi, shu "
+#~ "sababdan yaboot tizim yuklovchisi ishlamaydi. Oʻrnatish davom etadi ammo "
+#~ "tizimni yuklash uchun BootX yoki boshqa usuldan foydalanishingiz lozim "
+#~ "boʻladi. Root fayl tizimi uchun uchun kernel argumenti: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Marhamat"
+
+#~ msgid "Select All"
+#~ msgstr "Hammasini tanlash"
+
+#~ msgid "Bad package"
+#~ msgstr "Yomon paket"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "OT yuklagichi tayyorlanmoqda..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Tarmoq"
+
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Sizning ish stolingiz USB kalitda"
+
+#~ msgid "The 100%% open source Mageia distribution"
+#~ msgstr "100%% ochiq kodli Mageia distributivi"
+
+#~ msgid "Explore Linux easily with Mageia One"
+#~ msgstr "Mageia One yordamida Linux'ni osongina kashf eting"
+
+#~ msgid "A full Mageia desktop, with support"
+#~ msgstr "Toʻliq Mageia ish stoli, qoʻllab-quvvatlash bilan"
+
+#~ msgid "Mageia: distributions for everybody's needs"
+#~ msgstr "Mageia: barchaga moʻljallangan distributiv"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
diff --git a/perl-install/install/share/po/uz@cyrillic.po b/perl-install/install/share/po/uz@cyrillic.po
index c9f2508ad..bc6c09c61 100644
--- a/perl-install/install/share/po/uz@cyrillic.po
+++ b/perl-install/install/share/po/uz@cyrillic.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz@cyrillic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2010-01-07 11:35+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -20,38 +20,63 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "Сизнинг иш �толингиз USB калитда"
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, fuzzy, c-format
+msgid "Office tools"
+msgstr "Идора �танци��и"
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr ""
+
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "100%% очиқ кодли Mageia Linux ди�трибутиви"
+msgid "For family!"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "Mageia One ёрдамида Linux'ни о�онгина кашф �тинг"
+msgid "For developers!"
+msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Тўлиқ Mageia Linux иш �толи, қўллаб-қувватлаш билан"
+msgid "Thank you!"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia: барчага мўлжалланган ди�трибутив"
+msgid "Be Free!"
+msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Сизда қўшимча компакт-ди�к борми?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -64,93 +89,91 @@ msgstr ""
 "\n"
 "Мо�ланиши керак бўлган қўшимча ўрнатиш манба�и борми?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "Компакт-ди�к"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Тармоқ (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Тармоқ (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Тармоқ (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Ойнанинг манзили (URL)"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Манзил ftp:// ёки http:// билан бошланиши керак"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
-"Мавжуд бўлган ойналарнинг рўйхатини олиш учун Mageia Linux �айти билан алоқа "
+"Мавжуд бўлган ойналарнинг рўйхатини олиш учун %s �айти билан алоқа "
 "ўрнатилмоқда..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Мавжуд бўлган ойналарнинг рўйхатини олиш учун Mageia Linux �айти билан алоқа "
-"ўрнатиб бўлмади"
+"Мавжуд бўлган ойналарнинг рўйхатини олиш учун %s �айти билан алоқа ўрнатиб "
+"бўлмади"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Пакетларни олиш учун ойнани танланг"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS орқали ўрнатиш"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "NFS тўпламининг компьютер номини ва директори�ни киритинг"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "Компьютернинг номи кўр�атилмаган"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Директори� \"/\" белги билан бошлаши керак"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS �ерверининг хо�т номи"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Директори�"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Қўшимча"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -159,23 +182,90 @@ msgstr ""
 "Ойнада пакетлар рўйхатини топиб бўлмади. Манзил (URL) тўғри "
 "кўр�атилганлигини текширинг."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, fuzzy, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "\"%s\" тўпламидан ҳамма пакетларга �ътибор берилма�ин"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "�ллақачон ўрнатилган пакетлар қидирилмоқда..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Янгилаш учун пакетлар қидирилмоқда..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -188,88 +278,88 @@ msgstr ""
 "\n"
 "Давом �тишни и�тай�изми?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "%s файлини ўқишда хато рўй берди"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Қуйидаги ди�к(лар)нинг номи ўзгартирилди:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (олдинги номи %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Тармоқ"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Илтимо� тўпламни танланг"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Файл аллақачон мавжуд. Уни алмаштиришни и�тай�изми?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Рух�ат йўқ"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "NFS номи нотўғри"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "�отўғри тўплам %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Скриншотларни ди�кни бўлишдан аввал олиб бўлмайди"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr ""
 "Ўрнатиш тугаганидан кейин �криншотларни қуйидаги жойдан топиш мумкин: %s"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Ўрнатиш"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Мо�лаш"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Сиз %s'ни ҳам формат қилишингиз керак"
@@ -293,22 +383,22 @@ msgstr "Тармоқ ишга туширилмоқда"
 msgid "Bringing down the network"
 msgstr "Тармоқ ўчирилмоқда"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Илтимо� кутиб туринг, файл олинмоқда"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "манбани қўшиб бўлмади"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Баъзи пакетлардан ди�кка ну�ха олинмоқда"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "�у�ха олиш давом �тмоқда"
@@ -338,7 +428,22 @@ msgstr "�хши"
 msgid "maybe"
 msgstr "балки"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Таъриф йўқ"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -347,66 +452,76 @@ msgstr ""
 "%s талаб қиладиган баъзи пакетларни ўрнатиб бўлмайди:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "Хато рўй берди:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Жуда жиддий хато рўй берди: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d ўрнатиш транзакци��и муваффақи�т�из тугади"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Пакетларни ўрнатиб бўлмади:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Иш �танци��и"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Идора �танци��и"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Идора учун да�турлар: матн проце��орлари (OpenOffice.org Writer, Kword), "
-"�лектрон жадваллар (OpenOffice.org Calc, Kspread), PDF кўрувчилар ва ҳоказо"
+"Идора учун да�турлар: матн проце��орлари (LibreOffice Writer, Kword), "
+"�лектрон жадваллар (LibreOffice Calc, Kspread), PDF кўрувчилар ва ҳоказо"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Ўйин �танци��и"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Овунчоқ да�турлар: аркада, �тол ўйинлари, �тратеги� ва ҳоказо"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Мултимедиа �танци��и"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "�удио ва видеони ўйнаш/таҳрирлаш учун да�турлар"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Интернет �танци��и"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -415,205 +530,205 @@ msgstr ""
 "Хат-хабар, �нгиликларни ўқиш ва жўнатиш (mutt, tin..) ва Интернетда �айр "
 "қилиш учун во�италар тўплами"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Тармоқдаги компьютер (клиент)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Турли протоколлар, шу жумлада SSH, учун клиентлар"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Компьютерни мо�лашни енгилаштириш учун во�италар"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Кон�ол во�италари"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, 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:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Тузиш"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Қўлланмалар"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux ва �ркин да�турлар ҳақида китоблар ва Howto'лар"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Учинчи томон да�тур тузувчилари қўллануви"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Веб-�ервери"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab �ервери"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Файервол/Рутер"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Интернет гейтв�йи"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Хат-хабар/Янгиликлар"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix хат-хабар �ервери, Inn �нгиликлар �ервери"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Директори� �ервери"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP �ервери"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "DNS ва NIS"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Файл ва принтерни бўлишиш �ервери"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Маълумот база�и"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL ва MySQL маълумот база�и"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL ва MariaDB маълумот база�и"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Хат-хабар"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix хат-хабар �ервери"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL ёки MySQL маълумот база�и"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL ёки MariaDB маълумот база�и"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Тармоқдаги компьютер (�ервер)"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "График муҳит"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE �танци��и"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE - во�италар тўплами билан бирга а�о�ий график муҳит"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME �танци��и"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -622,66 +737,127 @@ msgstr ""
 "Фойдаланувчилар учун қулай да�турлар ва иш �толи во�италаридан иборат график "
 "муҳит"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:164
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE �танци��и"
+
+#: share/meta-task/compssUsers.pl:165
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Фойдаланувчилар учун қулай да�турлар ва иш �толи во�италаридан иборат график "
+"муҳит"
+
+#: share/meta-task/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME �танци��и"
+
+#: share/meta-task/compssUsers.pl:174
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Иш �танци��и"
+
+#: share/meta-task/compssUsers.pl:175
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "График муҳит"
+
+#: share/meta-task/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "LXQT Desktop"
+msgstr "LXDE иш �толи"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Фойдаланувчи учун қулай да�турлар ва иш �толи во�илари мавжуд бўлган енгил "
+"ва тез ишловчи график муҳит"
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE иш �толи"
 
-#: share/meta-task/compssUsers.pl:146
-#, c-format
-msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+#: share/meta-task/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment"
 msgstr ""
 "Фойдаланувчи учун қулай да�турлар ва иш �толи во�илари мавжуд бўлган енгил "
 "ва тез ишловчи график муҳит"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Plasma Desktop"
+msgstr "Бошқа иш �толи"
+
+#: share/meta-task/compssUsers.pl:195
+#, fuzzy, c-format
+msgid ""
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr "KDE - во�италар тўплами билан бирга а�о�ий график муҳит"
+
+#: share/meta-task/compssUsers.pl:199
 #, 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:200
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm, ва ҳоказо"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Во�италар"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH �ервери"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin ма�офадан бошқариш �ервери"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Тармоқ во�италари/�азорат қилиш"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "�азорат қилиш во�италари, вазифалар ҳи�оботчилари, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia ёрдамчилари"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Серверни мо�лаш учун ёрдамчилар"
@@ -695,7 +871,7 @@ msgstr ""
 "Хатолик юз берди аммо унинг �абаби аниқланмади.\n"
 "Тавваккал қилган ҳолда давом �тишингиз мумкин."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -715,251 +891,251 @@ msgstr "%s бо�қичга ўтилмоқда\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux ОТни ўрнатиш %s"
+msgid "%s Installation %s"
+msgstr "%s ОТни ўрнатиш %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> банддан-бандга"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg да�тури жуда �екин ишга туш�пти. Илтимо� кутиб туринг..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Тизимда ре�ур�лар етишмайди. Mageia Linux тизимини ўрнатиш мобайнида\n"
+"Тизимда ре�ур�лар етишмайди. %s тизимини ўрнатиш мобайнида\n"
 "муаммога дуч келишингиз мумкин. �гар шундай бўл�а, матн у�улида ўрнатиш "
 "во�ита�идан фойдаланиб кўринг,\n"
 "Бунинг учун ди�кдан юкланаётганда `F1' тугма�ини бо�инг ва `text' деб ёзинг."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Media Selection"
+msgstr "Манбани танлаш"
+
+#: steps_gtk.pm:253
+#, fuzzy, c-format
+msgid "Install %s KDE Desktop"
 msgstr "KDE иш �толи"
 
-#: steps_gtk.pm:240
-#, c-format
-msgid "Install Mageia GNOME Desktop"
+#: steps_gtk.pm:254
+#, fuzzy, c-format
+msgid "Install %s GNOME Desktop"
 msgstr "GNOME иш �толи"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "Бошқа"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE иш �толи"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME иш �толи"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "Бошқа иш �толи"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Бу '%s' иш �толининг кўриниши."
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Иш �толини �қинроқдан кўриш учун ра�мни �ичқонча билан бо�инг"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Пакетларни гуруҳ бўйича танлаш"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Пакетларни биттама-битта танлаш"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Жами: %d / %d Мб"
+msgid "Unselect All"
+msgstr "Ҳеч қай�и танланма�ин"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "�мон пакет"
+msgid "Total size: %d / %d MB"
+msgstr "Жами: %d / %d Мб"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Вер�и��и: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Ҳажми: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d Кб\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Муҳимлиги: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Бу пакетни танлолмай�из/танлашни бекор қилолмай�из"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "%s етишмагани учун"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s ативлаштиришга ҳаракат қилинмоқда"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s'ни қолдириш учун"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Бу пакетни танлолмай�из, чунки уни ўрнатиш учун етарли жой мавжуд �ма�."
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Қуйидаги пакетлар ўрнатилади"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Қуйидаги пакетлар олиб ташланилади."
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Бу ўрнатилиши шарт бўлган пакет, уни танлашни бекор қилиб бўлмайди."
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Бу пакетни танлашни бекор қилолмай�из. У аллақачон ўрнатилган."
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Бу пакетни танлашни бекор қилолмай�из. У �нгиланиши шарт."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "�втоматик равишда танланган пакетларни кўр�атиш"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Ўрнатиш"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Танланганни юклаш/�ақлаш"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Пакетлар танлови �нгиланмоқда"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Минимал ўрнатиш"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Да�турлар бошқаруви"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Сиз ўрнатмоқчи бўлган пакетларни танланг"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Ўрнатилмоқда"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Таф�илотлар�из"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "Қолган вақт:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(чамаланмоқда)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d-та пакет"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Ҳи�обот"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Мо�лаш"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "мо�ланмаган"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "Манбани танлаш"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -968,84 +1144,84 @@ msgstr ""
 "Қуйидаги ўрнатиш манбалари аниқланди.\n"
 "Фақат танланган манбалар ўрнатиш учун ишлатилади."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Ўрнатишдан аввал компакт-ди�клардаги пакетлардан компьютернинг ди�кига ну�ха "
 "олиш мумкин.\n"
 "Ўрнатиш тўлиқ тугагандан �ўнг улар тизимга маълум бўлади."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Бутун ди�кдан ну�ха олиш"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Хато рўй берди"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Илтимо� тугмалар тартибини танланг"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "Мавжуд бўлган клавиатураларнинг тўлиқ рўйхати:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Ўрнатиш/Янгилаш"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Бу ўрнатишми ёки �нгилашми?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Ўрнатиш"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s ОТни �нгилаш"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s учун кодлаш калити"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Ўрнатишни бекор қилиш, компьютерни ўчириб-ёқиш"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "Ўрнатиш"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Олдинги ўрнатишни �нгилаш (тав�и� �тилмайди)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1054,34 +1230,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE'ни мо�лаш"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"1Мблик юкловчи да�тур учун етарли жой қолмаган! Ўрнатиш давом �тади аммо "
-"тизимни юклаш учун DiskDrake'да да�тлабки юкловчи �ратилиши керак"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1095,71 +1254,71 @@ msgstr ""
 "�гар у �изда бўлма�а, бу компакт-ди�кдан ўрнатишни бекор қилиш учун \"Бекор "
 "қилиш\" тугма�ини бо�инг."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Мавжуд бўлган пакетлар қидирилмоқда..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr "Тизимда ўрнатиш ёки �нгилаш учун етарли жой қолмади (%d Мб > %d Мб)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
 msgstr ""
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Юклаш"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Сақлаш"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "�отўғри файл"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "Иш �толини танлаш"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Қуйидагилардан ўрнатиладиган иш �толини танланг"
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Танланган ҳажм мавжуд бўлган бўш жойдан катта"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Ўрнатишнинг тури"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1168,87 +1327,111 @@ msgstr ""
 "Сиз ҳеч қандай пакетлар гуруҳини танламадингиз.\n"
 "Илтимо� �из и�таган минимал ўрнатишни танланг:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X билан"
 
-#: steps_interactive.pm:583
-#, c-format
-msgid "Install suggested packages"
+#: steps_interactive.pm:579
+#, fuzzy, c-format
+msgid "Install recommended packages"
 msgstr "Таклиф қилинган пакетларни ўрнатиш"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "��о�ий қўлланмалар билан (тав�и� қилинади!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Ҳақиқий минимал ўрнатиш (ху�у�ан urpmi'�из)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, fuzzy, c-format
+msgid "Preparing upgrade..."
+msgstr "ОТ юклагичи тайёрланмоқда..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Ўрнатишга тайёрланмоқда"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "%s пакети ўрнатилмоқда"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Қуйидаги пакетларни �аралашда хато рўй берди:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Бунга қарама�дан давом �тишни и�тай�изми?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Қайтадан уриниш"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Бу пакетга �ътибор берилма�ин"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "\"%s\" тўпламидан ҳамма пакетларга �ътибор берилма�ин"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Ўрнатиш манбаларни ва пакетларни танлашга қайтиш"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Қуйидаги пакетни ўрнатишда хато рўй берди: %s"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Ўрнатишдан кейин мо�лаш"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "%s ичида Update Modules тўплами мавжудлигини текшириб кўринг"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Янгиланишлар"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1261,7 +1444,7 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Ҳозир �изда �нгиланган пакетларни ёзиб олиб ўрнатиш имкони�ти мавжуд.\n"
-"Улар ҳозир �из ўрнатган Mageia Linux тизими чиққанидан �ўнг\n"
+"Улар ҳозир �из ўрнатган Mageia тизими чиққанидан �ўнг\n"
 "�нгиланган. Уларда ҳар хил хавф�излик ва да�турлар билан боғлиқ\n"
 "хатоликлар тузатилган бўлиши мумкин.\n"
 "\n"
@@ -1270,28 +1453,29 @@ msgstr ""
 "\n"
 "Янгиланишларни ўрнатишни и�тай�изми?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s %s'да"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "��боб-у�куналар"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Товуш карта"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Сизда ISA товуш карта�и борми?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1300,82 +1484,70 @@ msgstr ""
 "Ўрнатишдан кейин, товуш картангизни мо�лаш учун, \"sndconfig\" ёки \"alsaconf"
 "\" да�турини ишга туширинг"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Товуш карта�и топилмади. Ўрнатишдан кейин \"harddrake\" да�турини �инаб "
 "кўринг."
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "График интерфей�"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Тармоқ ва Интернет"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Прок�илар"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "мо�ланган"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Хавф�излик даража�и"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Файервол"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "ишла�пти"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "ўчирилган"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Сиз X'ни мо�ламадингиз. Ро�тдан буни и�тай�изми?"
 
-#: steps_interactive.pm:1026
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "ОТ юклагичи тайёрланмоқда..."
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
+#, fuzzy, c-format
+msgid "Preparing initial startup program..."
+msgstr "Ўрнатишга тайёрланмоқда"
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Кутиб туринг, бу бироз вақт олиши мумкин..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Компьютерингиз жуда ��ки ру�умга ёки номаълум ру�мга ўхшайди, шу �абабдан "
-"yaboot тизим юкловчи�и ишламайди. Ўрнатиш давом �тади аммо тизимни юклаш "
-"учун BootX ёки бошқа у�улдан фойдаланишингиз лозим бўлади. Root файл тизими "
-"учун учун кернел аргументи: root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1384,17 +1556,17 @@ msgstr ""
 "Ушбу хавф�излик даража қўлланилганда ди�книнг Windows қи�мидаги файлларга "
 "фақат админи�тратор мурожаат қилиши мумкин."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Бўш ди�кетни %s у�куна�ига қўйинг"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "�вто-ўрнатиш ди�кети �ратилмоқда..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1405,12 +1577,12 @@ msgstr ""
 "\n"
 "Ро�тдан чиқишни и�тай�изми?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Табриклаймиз!"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Ўчириб-ёқиш"
@@ -1505,13 +1677,6 @@ msgid ""
 "Users"
 msgstr "Фойдаланувчилар"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Тармоқ"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1554,6 +1719,71 @@ msgid ""
 "Exit"
 msgstr "Чиқиш"
 
+#~ msgid "Preparing bootloader..."
+#~ msgstr "ОТ юклагичи тайёрланмоқда..."
+
+#~ msgid ""
+#~ "A lightweight & fast graphical environment with user-friendly set of "
+#~ "applications and desktop tools"
+#~ msgstr ""
+#~ "Фойдаланувчи учун қулай да�турлар ва иш �толи во�илари мавжуд бўлган "
+#~ "енгил ва тез ишловчи график муҳит"
+
+#, fuzzy
+#~ msgid "RazorQT Desktop"
+#~ msgstr "Бошқа иш �толи"
+
+#~ msgid ""
+#~ "No free space for 1MB bootstrap! Install will continue, but to boot your "
+#~ "system, you'll need to create the bootstrap partition in DiskDrake"
+#~ msgstr ""
+#~ "1Мблик юкловчи да�тур учун етарли жой қолмаган! Ўрнатиш давом �тади аммо "
+#~ "тизимни юклаш учун DiskDrake'да да�тлабки юкловчи �ратилиши керак"
+
+#~ msgid ""
+#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+#~ "will not work for you. The install will continue, but you'll need to use "
+#~ "BootX or some other means to boot your machine. The kernel argument for "
+#~ "the root fs is: root=%s"
+#~ msgstr ""
+#~ "Компьютерингиз жуда ��ки ру�умга ёки номаълум ру�мга ўхшайди, шу �абабдан "
+#~ "yaboot тизим юкловчи�и ишламайди. Ўрнатиш давом �тади аммо тизимни юклаш "
+#~ "учун BootX ёки бошқа у�улдан фойдаланишингиз лозим бўлади. Root файл "
+#~ "тизими учун учун кернел аргументи: root=%s"
+
+#~ msgid "Welcome"
+#~ msgstr "Марҳамат"
+
+#~ msgid "Select All"
+#~ msgstr "Ҳамма�ини танлаш"
+
+#~ msgid "Bad package"
+#~ msgstr "�мон пакет"
+
+#, fuzzy
+#~ msgid "Preparing boot images..."
+#~ msgstr "ОТ юклагичи тайёрланмоқда..."
+
+#~ msgid ""
+#~ "_: Keep these entry short\n"
+#~ "Networking"
+#~ msgstr "Тармоқ"
+
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Сизнинг иш �толингиз USB калитда"
+
+#~ msgid "The 100%% open source Mageia distribution"
+#~ msgstr "100%% очиқ кодли Mageia ди�трибутиви"
+
+#~ msgid "Explore Linux easily with Mageia One"
+#~ msgstr "Mageia One ёрдамида Linux'ни о�онгина кашф �тинг"
+
+#~ msgid "A full Mageia desktop, with support"
+#~ msgstr "Тўлиқ Mageia иш �толи, қўллаб-қувватлаш билан"
+
+#~ msgid "Mageia: distributions for everybody's needs"
+#~ msgstr "Mageia: барчага мўлжалланган ди�трибутив"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"
diff --git a/perl-install/install/share/po/vi.po b/perl-install/install/share/po/vi.po
index 9b5d30060..f38fdd7de 100644
--- a/perl-install/install/share/po/vi.po
+++ b/perl-install/install/share/po/vi.po
@@ -1,54 +1,80 @@
-# translation of DrakX-vi.po to 
-# Vietnamese Translation for DrakX module.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-# Trinh Minh Thanh <tmthanh@yahoo.com> 2001-2005.
-# Larry Nguyen <larry@vnlinux.org> 2005.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-vi version\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2005-06-02 21:17+0700\n"
-"Last-Translator: Larry Nguyen <larry@vnlinux.org>\n"
-"Language-Team:  <gnomevi-list@lists.sourceforge.net>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 04:07+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/mageia/"
+"language/vi/)\n"
+"Language: vi\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"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Bạn còn phương tiện nào khác không?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -57,116 +83,177 @@ msgid ""
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Mạng (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Mạng (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr ""
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL của mirror?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr ""
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"�ang kết nối với website của Mageia Linux để lấy danh sách các mirrors "
-"hiệncó..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "�ang kết nối với website của %s để lấy danh sách các mirrors hiệncó..."
 
-#: any.pm:187
-#, fuzzy, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+#: any.pm:253
+#, c-format
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"�ang kết nối với website của Mageia Linux để lấy danh sách các mirrors "
-"hiệncó..."
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Ch�n một mirror để tải các gói v�"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr ""
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr ""
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr ""
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr ""
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr ""
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Thư mục"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr ""
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "Không thể tìm tập tin hdlist trên mirror này"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Kiểm tra các gói đã được cài đặt..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "�ang tìm các gói để nâng cấp"
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -179,87 +266,87 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn gỡ b� các gói tin này không?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Lỗi khi đ�c tập tin %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "�ã đổi tên (các) đĩa sau:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (tên cũ là %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Mạng"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Hãy ch�n phương tiện"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Tập tin tồn tại. Có ghi đè nó không?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Quy�n hạn bị từ chối"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr ""
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "Phương tiện h�ng %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Không thể tạo ảnh đĩa trước khi phân vùng"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Sẽ có ảnh chụp sau quá trình cài đặt trong %s"
 
-#: gtk.pm:131
-#, fuzzy, c-format
+#: gtk.pm:135
+#, c-format
 msgid "Installation"
-msgstr "�ang cài đặt"
+msgstr ""
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Cũng phải định dạng %s"
@@ -283,22 +370,22 @@ msgstr "Bật chức năng mạng"
 msgid "Bringing down the network"
 msgstr "Tắt chức năng mạng"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr ""
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "�ang sao chép"
@@ -328,267 +415,292 @@ msgstr "tuyệt"
 msgid "maybe"
 msgstr "có thể là"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Không có mô tả"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "Lỗi xảy ra"
+msgstr ""
+
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Xả ra lỗi trầm tr�ng: %s."
 
-#: pkgs.pm:814
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "�ừng h�i nữa "
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d phiên giao dịch cài đặt lỗi"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "�ang cài đặt gói %s"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Máy trạm"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Văn phòng"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Các chương trình văn phòng: wordprocessors (OpenOffice.org Writer, Kword), "
-"spreadsheets (OpenOffice.org Calc, Kspread), chương trình xem PDF, v.v..."
+"Các chương trình văn phòng: wordprocessors (LibreOffice Writer, Kword), "
+"spreadsheets (LibreOffice Calc, Kspread), chương trình xem PDF, v.v..."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Trò chơi"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Các chương trình giải trí: arcade, boards, strategy, v.v..."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "�a phương tiện"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Các chương trình chơi Audio-Video/soạn thảo"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "Bộ công cụ đ�c gửi thư tín và tin tức (mutt, tin..) và để duyệt Web"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Máy tính mạng (khách)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Máy khách cho các giao thức khác bao gồm ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Công cụ xoá cấu hình máy tính của bạn"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Các công cụ console"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Các trình soạn thảo, các tiện ích tập tin, các thiết bị đầu cuối"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Phát triển"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr ""
 "Các thư viện phát triển C và C++, các chương trình và các tập tin đi kèm"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Tài liệu"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Các sách, how-to cho Linux và phần m�m miễn phí"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Cơ Sở V� Chuẩn Linux (LSB). Hỗ trợ ứng dụng cho hãng thứ ba."
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Máy chủ Web"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Groupware"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Máy chủ Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Tư�ng lửa/�ịnh tuyến"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Cổng kết nối Internet"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Mail/News"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, 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:97
 #, c-format
 msgid "Directory Server"
 msgstr "Máy chủ thư mục"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Máy chủ FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Máy chủ thông tin mạng và tên mi�n"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Máy chủ chia sẻ máy in và tập tin"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Máy chủ Samba, NFS"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Cơ sở dữ liệu"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Máy chủ cơ sở dữ liệu PostgreSQL và MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Máy chủ cơ sở dữ liệu PostgreSQL và MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache và Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "ThÆ°"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Máy chủ thư Postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL hay MySQL máy chủ cơ sở dữ liệu"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL hay MariaDB máy chủ cơ sở dữ liệu"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Máy chủ mạng"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Máy chủ NFS, SMB, SSH, ủy nhiệm"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Môi trư�ng đồ hoạ"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -596,12 +708,12 @@ msgid ""
 msgstr ""
 "K Desktop Environment, một môi trư�ng đồ h�a với một sưu tập tiện ích đi kèm"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME Workstation"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -609,65 +721,121 @@ msgid ""
 msgstr ""
 "Môi trư�ng đồ h�a thân thiện cho các ứng dụng và các tiện ích màn hình n�n"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "IceWm Desktop"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Môi trư�ng đồ h�a thân thiện cho các ứng dụng và các tiện ích màn hình n�n"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Các màn hình n�n đồ hoạ khác"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, v.v..."
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Tiện ích"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Máy chủ SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Cấu hình máy chủ từ xa Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Giám sát và công cụ mạng"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Các công cụ theo dõi, quản lý tiến trình, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "�ồ thuật Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "�ồ thuật cấu hình máy chủ"
@@ -681,7 +849,7 @@ msgstr ""
 "Có lỗi xảy ra, không rõ cách giải quyết thích hợp.\n"
 "Tiếp tục với rủi ro."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -700,251 +868,250 @@ msgstr "Bắt đầu bước `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Cài đặt Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Cài đặt %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> giữa các phần tử"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Hệ thống của bạn có cấu hình thấp. Bạn có thể gặp một số trục trặc khi\n"
-"cài đặt Mageia Linux. Nếu xảy ra lỗi, bạn có thể thay thế bằng kiểu cài đặt "
-"trong\n"
+"cài đặt %s. Nếu xảy ra lỗi, bạn có thể thay thế bằng kiểu cài đặt trong\n"
 "chế độ văn bản bằng cách nhấn phím `F1' khi khởi động từ CDROM, rồi nhập "
 "`text'."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr ""
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "Cài đặt tối thiểu"
+msgstr ""
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "IceWm Desktop"
+msgstr ""
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "IceWm Desktop"
+msgstr ""
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "IceWm Desktop"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Nhóm gói tin được ch�n"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Ch�n các gói riêng"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Kích thước toàn bộ: %d / %d MB"
+msgid "Unselect All"
+msgstr "M�i thứ không được ch�n"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "Gói h�ng"
+msgid "Total size: %d / %d MB"
+msgstr "Kích thước toàn bộ: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Phiên bản:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Kích thước:"
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Quan tr�ng:"
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Bạn không thể ch�n/b� ch�n gói này"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "vì thiếu %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "vì không th�a mãn %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "thử xúc tiến %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "để giữ %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Bạn không thể ch�n gói này vì không còn đủ không gian để cài đặt"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Các gói sau đây sẽ được cài đặt"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Các gói sau đây sẽ được gỡ b�"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Bắt buộc cài đặt gói này, không thể b� ch�n nó"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Bạn không thể b� ch�n gói này. Nó được cài đặt rồi"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Bạn không thể không ch�n gói này. Nó phải được nâng cấp."
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Tự động hiển thị các gói đã được ch�n"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Cài đặt"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Nạp/Lưu lựa ch�n"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "�ang cập nhật sự lựa ch�n các gói"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Cài đặt tối thiểu"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Quản Lý Phần M�m"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Ch�n các gói bạn muốn cài đặt "
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "�ang cài đặt"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Không có thông tin"
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "Th�i gian còn lại"
+msgstr ""
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "�ang ước lượng"
+msgstr ""
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d các gói"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Tóm tắt"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Cấu hình"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "chưa được cấu hình"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Nhóm gói tin được ch�n"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -953,12 +1120,12 @@ msgstr ""
 "Phát hiện thấy phương tiện cài đặt sau đây.\n"
 "Nếu không dùng, hãy b� ch�n chúng."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Bạn có thể copy nội dung của các CD lên đĩa cứng trước khi thực hiện cài "
@@ -966,72 +1133,72 @@ msgstr ""
 "Sau đó tiếp tục tiến hành cài đặt từ đĩa cứng và các gói vẫn sẵn dùng ngay "
 "sau khi cài đặt xong hệ thống."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Sao chép toàn bộ CD"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Lỗi xảy ra"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Hãy ch�n tổ chức bàn phím"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "�ây là danh sách đầy đủ các bàn phím hiện có "
+msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Cài đặt/Nâng cấp"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Thực hiện việc cài đặt hay nâng cấp ?"
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Cài đặt"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Nâng cấp %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Khóa mã hóa cho %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "�ang cài đặt"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1040,36 +1207,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "�ang cấu hình IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Không còn không gian trống 1MB cho bootstrap! Vẫn tiếp tục cài đặt, nhưng để "
-"khởi động hệ thống, bạn cần tạo phân vùng bootstrap trong DiskDrake."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Bạn cần tạo PPC PReP Boot bootstrap! Vẫn tiếp tục cài đặt, nhưng để khởi "
-"động hệ thống, bạn cần tạo phân vùng bootstrap trong DiskDrake."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1082,19 +1230,19 @@ msgstr ""
 "Hãy nạp đĩa CD có nhãn \"%s\" vào ổ đĩa rồi nhấn OK.\n"
 "Nếu bạn không có, nhấn B� qua để không chạy cài đặt từ đĩa này."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "�ang tìm các gói hiện có"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr ""
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1103,52 +1251,52 @@ msgstr ""
 "Hãy ch�n nạp hoặc lưu lựa ch�n gói tin.\n"
 "�ịnh dạng giống các tập tin auto_install được tạo."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Tải"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "LÆ°u"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Tập tin lỗi"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "Nhóm gói tin được ch�n"
+msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Kích thước được ch�n lớn hơn không gian hiện có"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Kiểu cài đặt"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1157,87 +1305,111 @@ msgstr ""
 "Bạn đã không ch�n bất kỳ một nhóm gói tin nào\n"
 "Hãy ch�n việc cài đặt tối thiểu mà bạn muốn"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Vá»›i X"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "�ang cài đặt gói %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Với tài liệu cơ bản (khuyến nghị!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Cài đặt thật tối thiểu (đặc biệt là không có urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Chuẩn bị cài đặt"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "�ang cài đặt gói %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Lỗi khi đang xử lý các gói:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Vẫn cứ tiếp tục?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr ""
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr ""
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr ""
 
-#: steps_interactive.pm:680
-#, fuzzy, c-format
+#: steps_interactive.pm:682
+#, c-format
 msgid "Go back to media and packages selection"
-msgstr "Lưu lựa ch�n các gói"
+msgstr ""
 
-#: steps_interactive.pm:683
-#, fuzzy, c-format
+#: steps_interactive.pm:685
+#, c-format
 msgid "There was an error installing package %s."
-msgstr "Lỗi khi đang cài đặt các gói:"
+msgstr ""
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Cấu hình sau khi cài đặt"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Hãy đảm bảo là phương tiện Update Modules có trong drive %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Cập nhật"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1250,35 +1422,36 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Bây gi� bạn có thể tải xuống các gói cập nhật. Những gói này được cập nhật\n"
-"sau khi phát hành phân phối Mageia Linux này. Chúng có thể\n"
+"sau khi phát hành phân phối Mageia này. Chúng có thể\n"
 "là cập nhật sửa lỗi hay cập nhật bảo mật.\n"
 "\n"
 "�ể tải v� những gói này, bạn cần có một kết nối Internet hoạt động.\n"
 "\n"
 "Bạn có muốn cài đặt các gói cập nhật không ?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s trên %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Phần cứng"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "Card âm thanh"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Bạn có card âm thanh ISA không ?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1287,81 +1460,69 @@ msgstr ""
 "Chạy lệnh \"alsaconf\" hoặc \"sndconfig\" sau khi cài đặt để cấu hìnhcard âm "
 "thanh"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Không phát hiện được card âm thanh nào. Hãy thử \"harddrake\" sau khi cài đặt"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Giao diện đồ h�a"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Mạng & Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Proxies"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "đã cấu hình"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Mức Bảo Mật"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Tư�ng lửa"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "�ã kích hoạt"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "�ã tắt"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Chưa đặt cấu hình cho X. Bạn có chắc là muốn như vậy không ?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "�ang chuẩn bị trình khởi động"
-
-#: steps_interactive.pm:1027
-#, c-format
-msgid "Be patient, this may take a while..."
+msgid "Preparing initial startup program..."
 msgstr ""
 
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1041
 #, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
+msgid "Be patient, this may take a while..."
 msgstr ""
-"Bạn có máy tính đã quá cũ hoặc không được biết đến, trình khởi động yaboot "
-"sẽ không làm việc. Vẫn tiếp tục cài đặt, nhưng bạn sẽ cần sử dụng BootX hoặc "
-"phương tiện khác để khởi động máy tính. �ối số của kernel cho root fs là: "
-"root=%s"
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1370,17 +1531,17 @@ msgstr ""
 "Với mức bảo mật này, chỉ ngư�i quản trị mới có quy�n truy cậpvào các tập tin "
 "trong phân vùng Windows."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Nạp một đĩa m�m trắng vào ổ %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "�ang tạo đĩa m�m cài đặt tự động"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1391,12 +1552,12 @@ msgstr ""
 "\n"
 "Bạn thực sự muốn thoát ra bây gi�?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Chúc mừng"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Khởi động lại"
@@ -1412,7 +1573,7 @@ msgstr "Ch�n ngôn ngữ"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "�ịa phương hóa"
 
 #: steps_list.pm:17
 #, c-format
@@ -1491,13 +1652,6 @@ msgid ""
 "Users"
 msgstr "Ngư�i dùng"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Chạy mạng"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1539,140 +1693,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Thoát ra"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Các chương trình văn phòng: wordprocessors (kword, abiword), spreadsheets "
-#~ "(kspread, gnumeric), pdf viewers, v.v..."
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "�ang tải v� tập tin %s..."
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Bạn đã ch�n các máy chủ sau đây: %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Các máy chủ này sẽ được kích hoạt theo mặc định. Hiện gi� chưa có bất kỳ\n"
-#~ "lỗi bảo mật nào được phát hiện, nhưng cũng có thể đã tìm ra một vài lỗi "
-#~ "má»›i.\n"
-#~ "Trong trư�ng hợp đó, bạn phải nâng cấp càng sớm càng tốt.\n"
-#~ "\n"
-#~ "\n"
-#~ "Bạn có thật sự muốn cài đặt các máy chủ này không?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "IceWm Desktop"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "�ang kết nối với mirror để lấy danh sách các gói hiện có"
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Không thể kết nối được với mirror %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Tạo đĩa m�m cài đặt tự động"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "Cài đặt tự động có thể hoàn toàn tự động nếu\n"
-#~ "muốn, trong trư�ng hợp này nó sẽ tiếp nối ổ cứng!!\n"
-#~ "(Nghĩa là tiến hành cài đặt lên một ổ khác).\n"
-#~ "\n"
-#~ "Có thể bạn thích diễn lại quá trình cài đặt.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Diễn lại"
-
-#~ msgid "Automated"
-#~ msgstr "Tá»± Ä‘á»™ng"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Lưu lựa ch�n các gói"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Bạn có muốn sử dụng aboot không?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Lỗi khi cài đặt aboot, \n"
-#~ "Cố gắng cài đặt kể cả khi nó có thể phá h�ng phân vùng đầu tiên?"
-
-#~ msgid "All"
-#~ msgstr "Toàn bộ"
-
-#~ msgid "TV card"
-#~ msgstr "Card TV"
-
-#~ msgid "Boot"
-#~ msgstr "Khởi động"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Xác nhận"
-
-#~ msgid "Gwenview"
-#~ msgstr "Gwenview"
-
-#~ msgid "DrakVPN"
-#~ msgstr "DrakVPN"
-
-#~ msgid "%d packages"
-#~ msgstr "%d các gói"
-
-#~ msgid "Language"
-#~ msgstr "Ch�n ngôn ngữ"
-
-#~ msgid "License"
-#~ msgstr "Giấy phép"
-
-#, fuzzy
-#~ msgid "Installation class"
-#~ msgstr "Ch�n kiểu cài đặt"
-
-#, fuzzy
-#~ msgid "Formatting"
-#~ msgstr "�ang ước lượng"
-
-#, fuzzy
-#~ msgid "Choosing packages"
-#~ msgstr "Ch�n các gói cài đặt"
-
-#~ msgid "Users"
-#~ msgstr "Ngư�i dùng"
-
-#~ msgid "Networking"
-#~ msgstr "Chạy mạng"
-
-#~ msgid "Configure X"
-#~ msgstr "Cấu hình X"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "Không thể truy cập các mô-đun kernel tương ứng với kernel của bạn (thiếu "
-#~ "tập tin %s), thư�ng là do đĩa m�m khởi động không đồng bộ với các phương "
-#~ "tiện cài đặt (hãy tạo một đĩa m�m khởi động mới hơn)"
diff --git a/perl-install/install/share/po/wa.po b/perl-install/install/share/po/wa.po
index a681dea8c..421249443 100644
--- a/perl-install/install/share/po/wa.po
+++ b/perl-install/install/share/po/wa.po
@@ -1,57 +1,84 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Pablo Saratxaga <pablo@mandriva.com>, 2000,2002,2003,2004,2006.
-# Lorint Hendschel <lorinthendschel@skynet.be>, 2002.
-# Lucyin Mahin <lucyin@walon.org>, 2002,2003,2005.
-# Pablo Saratxaga <pablo@walon.org>, 2003,2004,2005,2006.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Lorint Hendschel <lorinthendschel@skynet.be>, 2002
+# Lucyin Mahin <lucyin@walon.org>, 2002-2003,2005
+# Pablo Saratxaga <pablo@mandriva.com>, 2000,2002-2004,2006
+# Pablo Saratxaga <pablo@walon.org>, 2003-2006
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2005-02-24 21:42+0100\n"
-"Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
-"Language-Team: Walloon <linux-wa@walon.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-21 04:07+0000\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Walloon (http://www.transifex.com/projects/p/mageia/language/"
+"wa/)\n"
+"Language: wa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: KBabel 1.0.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
+msgid "Join Us!"
 msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/02_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
+msgid "Make it yours!"
 msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
+msgid "Your choice!"
 msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
+msgid "Office tools"
 msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
+msgid "Home entertainment"
 msgstr ""
 
-#: any.pm:109
+#: ../../advertising/06_IM_mageia.pl:1
+#, c-format
+msgid "For kids"
+msgstr ""
+
+#: ../../advertising/07_IM_mageia.pl:1
+#, c-format
+msgid "For family!"
+msgstr ""
+
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Avoz vs co ds ôtes sopoirts?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -65,93 +92,89 @@ msgstr ""
 "\n"
 "Avoz vs cor on sopoirt d' astalaedje a-z apontyî?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "Plake lazer"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Rantoele (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "Rantoele (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "Rantoele (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Hårdêye do muroe?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Li hårdêye doet cmincî avou «ftp://» ou «http://»"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr ""
-"Dj' atôtche li waibe da Mageia Linux po-z aveur li djivêye des muroes k' i "
-"gn a"
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "Dj' atôtche li waibe da %s po-z aveur li djivêye des muroes k' i gn a"
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
-"Dji n' a savou atôtchî l' waibe da Mageia Linux po-z aveur li djivêye des "
-"muroes k' i gn a"
+"Dji n' a savou atôtchî l' waibe da %s po-z aveur li djivêye des muroes k' i "
+"gn a"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Tchoezixhoz on muroe po nd aberweter des pacaedjes foû"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "Apontiaedje NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Tapez l' no d' lodjoe eyet l' ridant di vosse sopoirt NFS"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "I manke li no d' lodjoe"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Li ridant doet cmincî avou «/»"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "No d' lodjoe do montaedje NFS?"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "Ridant"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "Di rawete"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -160,23 +183,90 @@ msgstr ""
 "Dji n' sai trover l' djivêye di fitchîs so ç' muroe ci. Acertinez vs ki "
 "l' eplaeçmint est corek."
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr ""
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Dji cwir après les pacaedjes ki sont ddja astalés..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Dji cwir après les pacaedjes a mete a djoû"
 
-#: any.pm:388
+#: any.pm:653
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Dji oistêye des pacaedjes divant d' fé l' metaedje a djoû..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -190,87 +280,87 @@ msgstr ""
 "\n"
 "Voloz vs vormint oister ces pacaedjes la?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "Åk n' a nén stî come dji sayive di lére li fitchî %s"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Les plakes shuvantes ont candjî d' no:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (lomêye divant %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "Rantoele"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "Tchoezixhoz on sopoirt s' i vs plait"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Li fitchî egzistêye dedja. El voloz vs sipotchî?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "Permission rfuzêye"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "MÃ¥va no NFS"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "MÃ¥va sopoirt %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Dji n' pou nén fé des waitroûlêyes divant l' pårtixhaedje"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Les waitroûlêyes seront metowes el ridant %s après l' astalaedje"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "Astalaedje"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "Apontiaedje"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "Vos dvoz abwesner eto %s"
@@ -294,22 +384,22 @@ msgstr "Metant li rantoele en alaedje"
 msgid "Bringing down the network"
 msgstr "Dj' arestêye li rantoele"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Dji copeye sacwants pacaedjes sol deure plake po pus tård"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "Dji copeye..."
@@ -339,73 +429,100 @@ msgstr "plaijhi a-z aveur"
 msgid "maybe"
 msgstr "ki vénreut co bén a pont"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr ""
+"Pont d' info xml pol sopoirt «%s», i n' a k' on rzultat parciel pol pacaedje "
+"%s"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "Nou discrijhaedje"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:327
-#, fuzzy, c-format
+#: pkgs.pm:382 pkgs.pm:409
+#, c-format
 msgid "An error occurred:"
-msgstr "Dj' aroke so ene sacwè"
+msgstr "Åk n' a nén stî:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "I gn a-st avou èn aroke moirt: %s."
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr ""
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
 
-#: pkgs.pm:815
-#, fuzzy, c-format
+#: pkgs.pm:912
+#, c-format
 msgid "Installation of packages failed:"
-msgstr "Dj' astale li pacaedje %s"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "Posse éndjolrece"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "Posse di buro"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Programes di buro: aspougneus di tecse (OpenOffice.org Writer, Kword), "
-"tåvleus (OpenOffice.org Calc, Kspread), håyneus pdf, evnd."
+"Programes di buro: aspougneus di tecse (LibreOffice Writer, Kword), tåvleus "
+"(LibreOffice Calc, Kspread), håyneus pdf, evnd."
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "Posse di djeus"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Programes pasmints d' tins: årcåde, plateas, stratedjeye, evnd."
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "Posse multimedia"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Programes po vey/schoûter/candjî des sons et videyos"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Posse pol rantoele daegnrece"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -414,193 +531,193 @@ msgstr ""
 "Eshonna d' usteyes po lére et evoyî des messaedjes (pine, mutt, tin...) et "
 "po naivyî so les pådjes waibe"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Copiutrece rantoele (cliyint)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Cliyints po les protocoles k' i gn a (ssh avou)"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Usteyes po vos aveur pus åjhey d' apontyî vosse copiutrece"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Usteyes pol conzôle"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Aspougneus, shells, usteyes po fitchîs, terminås"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "Programaedje"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Livreyes di programaedje C et C++, programes et fitchîs *.h"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "Documintåcion"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Lives et Howtos so GNU/Linux et les libes programes"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Li «Linux Standard Base». Sopoirt po les programes tîces"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Sierveu waibe"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "Ovraedje e groupe"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Sierveu Kolab"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "Côpe feu/Routeu"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Pasrele pol rantoele daegnrece"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "Emilaedje/Copinreyes"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Sierveu d' emilaedje postfix, sierveu d' copinreyes INN"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "Sierveu d' botins"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "Sierveu FTP"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Sierveu di nos d' dominne eyet d' informåcion rantoele"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Sierveu di pårtaedje di fitchîs eyet di scrireces"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "Sierveu NFS, sierveu Samba"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "Sierveu, båzes di dnêyes"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "Sierveu båze di dnêyes PostgreSQL eyet MySQL"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "Sierveu båze di dnêyes PostgreSQL eyet MariaDB"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Sierveu, Waibe/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache eyet Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "Emilaedje"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Sierveu d' emilaedje postfix"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "Sierveu båze di dnêyes PostgreSQL ou MySQL"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "Sierveu båze di dnêyes PostgreSQL ou MariaDB"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "Copiutrece sierveu sol rantoele"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "Sierveu NFS, sierveu SMB, sierveu procsi, sierveu SSH"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "Evironmint grafike"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "Posse éndjolrece KDE"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -609,12 +726,12 @@ msgstr ""
 "L' evironmint di scribanne KDE, l' evironmint grafike di båze, avou ene "
 "ramexhnêye d' usteyes ki vnèt avou"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Posse éndjolrece GNOME"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -623,66 +740,121 @@ msgstr ""
 "Èn evironmint grafike avou on hopea di programes amiståves et d' usteyes pol "
 "sicribanne"
 
-#: share/meta-task/compssUsers.pl:144
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
+#, c-format
 msgid "LXDE Desktop"
-msgstr "Sicribanne IceWm"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:146
-#, fuzzy, c-format
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:195
+#, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
 msgstr ""
-"Èn evironmint grafike avou on hopea di programes amiståves et d' usteyes pol "
-"sicribanne"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Ôtes sicribannes grafikes"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, evnd."
+msgid "Window Maker, Fvwm, etc"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "Usteyes"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "Sierveu SSH"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Sierveu d' apontiaedje då lon Webmin"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Usteyes rantoele/Corwaitaedje"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Usteyes di corwaitaedje, contaedje des process, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Macreas Mageia"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Macreas po-z apontyî on sierveu"
@@ -696,7 +868,7 @@ msgstr ""
 "Åk n' a nén stî, et dji n' sai cmint m' saetchî l' cou foû des\n"
 "strons. Si vos continouwez, vos dvroz tirer vosse plan tot seu."
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -717,253 +889,253 @@ msgstr "Intrant e l' etape '%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Astalåcion di Mageia Linux %s"
+msgid "%s Installation %s"
+msgstr "Astalåcion di %s %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> candjî elemints"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr ""
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Vosse sistinme a po di rsources. Vos pôrîz aveur des rujhes po\n"
-"l' astalåcion di Mageia Linux. Si çoula arive, vos ploz sayî ene\n"
+"l' astalåcion di %s. Si çoula arive, vos ploz sayî ene\n"
 "astalåcion e môde tecse. Po çoula, tchoûkîz sol tape «F1» a l' enondaedje\n"
 "et poy tapez «text»."
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
+#, c-format
+msgid "Media Selection"
+msgstr ""
+
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia KDE Desktop"
+msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:254
 #, c-format
-msgid "Install Mageia GNOME Desktop"
+msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:241
-#, fuzzy, c-format
+#: steps_gtk.pm:255
+#, c-format
 msgid "Custom install"
-msgstr "Astalåcion minimåle"
+msgstr ""
 
-#: steps_gtk.pm:262
-#, fuzzy, c-format
+#: steps_gtk.pm:276
+#, c-format
 msgid "KDE Desktop"
-msgstr "Sicribanne IceWm"
+msgstr ""
 
-#: steps_gtk.pm:263
-#, fuzzy, c-format
+#: steps_gtk.pm:277
+#, c-format
 msgid "GNOME Desktop"
-msgstr "Sicribanne IceWm"
+msgstr ""
 
-#: steps_gtk.pm:264
-#, fuzzy, c-format
+#: steps_gtk.pm:278
+#, c-format
 msgid "Custom Desktop"
-msgstr "Sicribanne IceWm"
+msgstr ""
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Tchoezi les groupes di pacaedjes"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "Tchoezi tchaeke pacaedje sepårumint"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Grandeu å totå: %d / %d Mo"
+msgid "Unselect All"
+msgstr "Distchoezi tot"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "MÃ¥va pacaedje"
+msgid "Total size: %d / %d MB"
+msgstr "Grandeu å totå: %d / %d Mo"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Modêye: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Grandeu: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d Ko\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Impôrtance: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "Vos n' poloz nén tchoezi/distchoezi ci pacaedje chal"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "cåze di %s ki manke"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "cåze di %s ki n' est nén satisfyî"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "dji saye di promouvwer %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "po wårder %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr ""
 "Vos n' poloz tchoezi ci pacaedje chal ca n' a nén del plaece assez ki po "
 "l' astaler"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Les pacaedjes ki shuvèt vont esse astalés"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Les pacaedjes ki shuvèt vont esse disastalés"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ci pacaedje est obligatwere, vos n' poloz nén li distchoezi"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "Vos n' poloz nén distchoezi ci pacaedje chal. Il est ddja astalé"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Vos n' poloz nén distchoezi ci pacaedje chal. I l' fåt mete a djoû"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Mostrer les pacaedjes tchoezis otomaticmint"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Astalaedje"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Tcherdjî/schaper li tchuze des pacaedjes"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Metaedje a djoû del tchuze des pacaedjes"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Astalåcion minimåle"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Manaedjaedje di programes"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Tchoezixhoz les pacaedjes k' vos voloz astaler"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Astalant"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Po vey les rclames"
 
-#: steps_gtk.pm:584
-#, fuzzy, c-format
+#: steps_gtk.pm:600
+#, c-format
 msgid "Time remaining:"
-msgstr "Tins ki dmeure "
+msgstr ""
 
-#: steps_gtk.pm:585
-#, fuzzy, c-format
+#: steps_gtk.pm:601
+#, c-format
 msgid "(estimating...)"
-msgstr "Dj' asteme"
+msgstr ""
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pacaedje"
 msgstr[1] "%d pacaedjes"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Rascourti éndjolreye"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Apontyî"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "nén apontyî"
 
-#: steps_gtk.pm:740
-#, fuzzy, c-format
-msgid "Media Selection"
-msgstr "Tchoezi les groupes di pacaedjes"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -973,12 +1145,12 @@ msgstr ""
 "Si vos vloz passer houte di sacwants d' zels, vos les ploz asteure "
 "distchoezi."
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "Vos ploz copyî l' contnou des plakes lazer so vosse deure plake divant "
@@ -986,72 +1158,72 @@ msgstr ""
 "L' astalaedje si frè-st adon a pårti del deure plake, eyet les pacaedjes "
 "vont dmorer disponibes on côp ki l' sistinme serè astalé."
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copyî les plakes lazer en etir"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "Dj' aroke so ene sacwè"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "Tchoezixhoz li sôre di vosse taprece"
 
-#: steps_interactive.pm:108
-#, fuzzy, c-format
+#: steps_interactive.pm:109
+#, c-format
 msgid "Here is the full list of available keyboards:"
-msgstr "Vochal li djivêye di totes les tapreces k' on pout tchoezi"
+msgstr ""
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Astaler/Mete a djoû"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "C' est ene astalåcion ou on metaedje a djoû?"
 
-#: steps_interactive.pm:152
-#, fuzzy, c-format
+#: steps_interactive.pm:159
+#, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Astalaedje"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "Metaedje a djoû di %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Clé d' ecriptaedje po %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr ""
 
-#: steps_interactive.pm:206
-#, fuzzy, c-format
+#: steps_interactive.pm:218
+#, c-format
 msgid "New Installation"
-msgstr "Astalaedje"
+msgstr ""
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr ""
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1060,38 +1232,17 @@ msgid ""
 "Installation\"."
 msgstr ""
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "Apontiant les éndjins IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"I gn a pont del plaece po on secteu d' enondaedje di 1 Mo! L' astalåcion "
-"continouwrè, mins i vos fårè fé li pårticion d' enondaedje avou DiskDrake po "
-"poleur enonder vosse sistinme."
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Vos dvoz ahiver on secteu d' enondaedje PPC PReP! L' astalåcion continouwrè, "
-"mins i vos fårè fé li pårticion d' enondaedje avou DiskDrake po poleur "
-"enonder vosse sistinme."
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1106,12 +1257,12 @@ msgstr ""
 "Si vos n' l' avoz nén, clitchîz so «Rinoncî» po rinoncî a astaler a pårti\n"
 "di ci CDROM chal."
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Dji cwir après les pacaedjes k' i gn a"
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
@@ -1120,7 +1271,7 @@ msgstr ""
 "I gn a pus del plaece assez so vosse sistinme po-z astaler ou mete a djoû "
 "(%dMo > %dMo)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1129,52 +1280,52 @@ msgstr ""
 "Tchoezixhoz si vos vloz tcherdjî ou schaper li tchuze des pacaedjes.\n"
 "Li cogne est l' minme ki po les fitchîs fwaits po l' oto-astalaedje."
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "Tcherdjî"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "Schaper"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "Måva fitchî"
 
-#: steps_interactive.pm:469
-#, fuzzy, c-format
+#: steps_interactive.pm:455
+#, c-format
 msgid "KDE"
-msgstr "IDE"
+msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
-#, fuzzy, c-format
+#: steps_interactive.pm:459
+#, c-format
 msgid "Desktop Selection"
-msgstr "Tchoezi les groupes di pacaedjes"
+msgstr ""
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Li grandeu tchoezeye est pus grande kel plaece ki dmeure"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Sôre d' astalaedje"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1183,89 +1334,113 @@ msgstr ""
 "Vos n' avoz tchoezi nou groupe di pacaedjes\n"
 "Tchoezixhoz li sôre d' astalåcion minimom ki vos vloz"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Avou X11"
 
-#: steps_interactive.pm:583
-#, fuzzy, c-format
-msgid "Install suggested packages"
-msgstr "Dj' astale li pacaedje %s"
+#: steps_interactive.pm:579
+#, c-format
+msgid "Install recommended packages"
+msgstr ""
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Avou li documintåcion di båze (ricomandé!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Astalåcion vormint minimom (i gn a nén di urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr ""
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "Dj' aprestêye l' astalaedje"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "Dj' astale li pacaedje %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Åk n' a nén stî come dj' arindjive les pacaedjes:"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "Dji continouwe tot l' minme?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "Rissayî"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "Passer houte di ç' pacaedje ci"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Passer houte di tos les pacaedjes do sopoirt «%s»"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Rivni al tchuze des pacaedjes et des sopoirts"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Åk n' a nén stî come dj' astaléve li pacaedje %s."
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "Apontiaedje di post-astalåcion"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr ""
 "Acertinez vs ki l' sopoirt di metaedje a djoû des modules est dins l' lijheu "
 "%s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Metaedjes a djoû"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1285,28 +1460,29 @@ msgstr ""
 "\n"
 "Voloz vs astaler les pacaedjes metous a djoû?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%s so %s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "Éndjolreye"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "CÃ¥te son"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Avoz vs ene cåte son ISA?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1315,82 +1491,70 @@ msgstr ""
 "Enondez «alsaconf» ou «sndconfig» après l' astalåcion po-z apontyî vosse "
 "cåte son"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Nole cåte son di detectêye. Sayîz «harddrake» après l' astalåcion"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "Eterface grafike"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "Rantoele locåle & daegnrece"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "Procsis"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "apontyî"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "Livea di såvrité"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "Côpe feu"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "metou en alaedje"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "dismetou"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Vos n' avoz nén apontyî X11 (li sistinme di håynaedje grafike).\n"
 "Estoz vs seur di voleur çoula?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "Dj' aprestêye l' enondrece"
-
-#: steps_interactive.pm:1027
-#, c-format
-msgid "Be patient, this may take a while..."
+msgid "Preparing initial startup program..."
 msgstr ""
 
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1041
 #, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
+msgid "Be patient, this may take a while..."
 msgstr ""
-"I shonne ki voste éndjole est pår trop viye oudonbén k' ele nén cnoxhowe; "
-"adon l' enondrece yaboot ni rotrè nén por vos. L' astalaedje va continouwer, "
-"mins vos dvroz eployî BootX ou ôte tchoi po-z enonder voste éndjole. "
-"L' årgumint a passer å nawea pol pårticion raecene est: root=%s"
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1399,17 +1563,17 @@ msgstr ""
 "Dins ç' livea di såvrité chal, l' accès åzès fitchîs des pårticions Windows "
 "n' est possibe ki po l' manaedjeu di l' éndjole."
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Metoz ene blanke plakete divins li lijheu %s"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Dji fé li plakete d' enondaedje otomatike"
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1420,12 +1584,12 @@ msgstr ""
 "\n"
 "Voloz vs vormint cwiter asteure?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "Complumints"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "Renonder l' éndjole"
@@ -1441,7 +1605,7 @@ msgstr "Lingaedje"
 #: steps_list.pm:16 steps_list.pm:23
 #, c-format
 msgid "Localization"
-msgstr ""
+msgstr "Locålizaedje"
 
 #: steps_list.pm:17
 #, c-format
@@ -1520,13 +1684,6 @@ msgid ""
 "Users"
 msgstr "Uzeus"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "Rantoele"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1568,197 +1725,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Moussî foû"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Programes di buro: aspougneus di tecse (kword, abiword), tåvleus "
-#~ "(kspread, gnumeric), håyneus pdf, evnd."
-
-#~ msgid "Downloading file %s..."
-#~ msgstr "Aberwetaedje do fitchî %s..."
-
-#~ msgid ""
-#~ "You have selected the following server(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "These servers are activated by default. They do not have any known "
-#~ "security\n"
-#~ "issues, but some new ones could be found. In that case, you must make "
-#~ "sure\n"
-#~ "to upgrade as soon as possible.\n"
-#~ "\n"
-#~ "\n"
-#~ "Do you really want to install these servers?\n"
-#~ msgstr ""
-#~ "Vos avoz tchoezi le(s) sierveu(s) shuvant(s): %s\n"
-#~ "\n"
-#~ "\n"
-#~ "Ces sierveus sront activés a l' enondaedje di l' éndjole. I n' ont nén\n"
-#~ "di problinme di såvrité cnoxhou, mins i s' pôreut k' onk soeye trové el "
-#~ "futeur.\n"
-#~ "Dins ç' cas, vos dvroz a tot côp mete a djoû li pacaedje po esse a houte\n"
-#~ "des problinmes.\n"
-#~ "\n"
-#~ "\n"
-#~ "Voloz vs vormint astaler ces sierveus?\n"
-
-#~ msgid "IceWm Desktop"
-#~ msgstr "Sicribanne IceWm"
-
-#~ msgid "Contacting the mirror to get the list of available packages..."
-#~ msgstr "Dj' atôche li muroe po-z aveur li djivêye des pacaedjes"
-
-#~ msgid "Unable to contact mirror %s"
-#~ msgstr "Dji n' a savou m' raloyî å muroe %s"
-
-#~ msgid "Generate auto install floppy"
-#~ msgstr "Fé li plakete d' astalaedje otomatike"
-
-#~ msgid ""
-#~ "The auto install can be fully automated if wanted,\n"
-#~ "in that case it will take over the hard drive!!\n"
-#~ "(this is meant for installing on another box).\n"
-#~ "\n"
-#~ "You may prefer to replay the installation.\n"
-#~ msgstr ""
-#~ "L' astalaedje pout esse totafwait otomatike si vos vloz,\n"
-#~ "dins ci cas i va abwesner totafwait li deure plake!!\n"
-#~ "(dj' ô bén c' est po-z astaler sor ene nouve éndjole).\n"
-#~ "\n"
-#~ "Motoit ki vos vloz rifé l' astalåcion.\n"
-
-#~ msgid "Replay"
-#~ msgstr "Rifé"
-
-#~ msgid "Automated"
-#~ msgstr "Otomatike"
-
-#~ msgid "Save packages selection"
-#~ msgstr "Schaper li tchuze des pacaedjes"
-
-#~ msgid "Do you want to use aboot?"
-#~ msgstr "Voloz vs eployî aboot?"
-
-#~ msgid ""
-#~ "Error installing aboot, \n"
-#~ "try to force installation even if that destroys the first partition?"
-#~ msgstr ""
-#~ "Åk n' a nén stî tot astalant aboot, \n"
-#~ "voloz vs ki dji saye di foirci l' astalåcion, minme si çoula pout\n"
-#~ "distrure li prumire pårticion?"
-
-#~ msgid "All"
-#~ msgstr "Totafwait"
-
-#~ msgid "TV card"
-#~ msgstr "Cåte tévé"
-
-#~ msgid "Boot"
-#~ msgstr "Enondaedje"
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Authentication"
-#~ msgstr "Otintifiaedje"
-
-#~ msgid "Arkeia"
-#~ msgstr "Arkeia"
-
-#~ msgid "Flatout"
-#~ msgstr "Flatout"
-
-#~ msgid "Gwenview"
-#~ msgstr "Gwenview"
-
-#~ msgid "3D"
-#~ msgstr "3D"
-
-#~ msgid "CMS"
-#~ msgstr "CMS"
-
-#~ msgid "CRM"
-#~ msgstr "CRM"
-
-#~ msgid "2007 product line"
-#~ msgstr "ligne di prodûts 2007"
-
-#~ msgid "Invictus Firewall"
-#~ msgstr "Côpe feu Invictus"
-
-#~ msgid "Discovery Live Mode"
-#~ msgstr "Môde «Discovery Live»"
-
-#~ msgid "How to register"
-#~ msgstr "Kimint s' edjîstrer"
-
-#~ msgid "Rpmdrake 2"
-#~ msgstr "Rpmdrake 2"
-
-#~ msgid "Mandriva Online Services"
-#~ msgstr "Siervices so les fyis di Mandriva"
-
-#~ msgid "New Theme"
-#~ msgstr "Novea tinme"
-
-#~ msgid "Web 2.0"
-#~ msgstr "Web 2.0"
-
-#~ msgid "Kaspersky"
-#~ msgstr "Kaspersky"
-
-#~ msgid "LinDVD"
-#~ msgstr "LinDVD"
-
-#~ msgid "Skype"
-#~ msgstr "Skype"
-
-#~ msgid "Transgaming/Cedega"
-#~ msgstr "Transgaming/Cedega"
-
-#~ msgid "DrakVPN"
-#~ msgstr "DrakVPN"
-
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "(%d pacaedje, %d Mo)"
-#~ msgstr[1] "(%d pacaedjes, %d Mo)"
-
-#~ msgid "%d packages"
-#~ msgstr "%d pacaedjes"
-
-#~ msgid "Language"
-#~ msgstr "Lingaedje"
-
-#~ msgid "License"
-#~ msgstr "Licince"
-
-#~ msgid "Installation class"
-#~ msgstr "Li classe d' astalåcion"
-
-#~ msgid "Formatting"
-#~ msgstr "Abwesnaedje"
-
-#~ msgid "Choosing packages"
-#~ msgstr "Tchoezi les pacaedjes"
-
-#~ msgid "Users"
-#~ msgstr "Uzeus"
-
-#~ msgid "Networking"
-#~ msgstr "Rantoele"
-
-#~ msgid "Configure X"
-#~ msgstr "Apontyî X"
-
-#~ msgid ""
-#~ "Cannot access kernel modules corresponding to your kernel (file %s is "
-#~ "missing), this generally means your boot floppy in not in sync with the "
-#~ "Installation medium (please create a newer boot floppy)"
-#~ msgstr ""
-#~ "Dji n' sai vey les modules po vosse nawea (i gn a pont d' fitchî %s), "
-#~ "çoula vout probåblumint dire ki vosse plakete d' enondaedje n' a nén stî "
-#~ "fwait pol sopoirt d' astalaedje ki vos vloz eployî. Vos dvrîz fé ene "
-#~ "nouve plakete, a pårti des imådjes ki vnèt avou li modêye di Mandriva "
-#~ "Linux ki vos vloz astaler"
diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index fa9a1f70b..b0931b1f9 100644
--- a/perl-install/install/share/po/zh_CN.po
+++ b/perl-install/install/share/po/zh_CN.po
@@ -1,55 +1,85 @@
-# drakx messages in Simplified Chinese
-# Danny Zeng <danny@zeng.com.cn>, 2000, 2002
-# Jesse Kuang <kjx@mandriva.com>, 2002
-# Shiyu Tang <shiyutang@netscape.net>, 2003, 2004
-# Funda Wang <fundawang@linux.net.cn>, 2002, 2003, 2004, 2005
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Danny Zeng <danny@zeng.com.cn>, 2000,2002
+# Funda Wang <fundawang@linux.net.cn>, 2002-2005
+# Jesse Kuang <kjx@mandriva.com>, 2002
+# Shiyu Tang <shiyutang@netscape.net>, 2003-2004
+# xiao wenming <xwm-citcc5@hotmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX 2008 Spring\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2009-04-09 11:49+0800\n"
-"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Mageia Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-02-13 05:25+0000\n"
+"Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/"
+"language/zh_CN/)\n"
+"Language: zh_CN\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"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
+#, c-format
+msgid "Join Us!"
+msgstr "加入我们�"
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr ""
+
+#: ../../advertising/04_IM_mageia.pl:1
+#, c-format
+msgid "Office tools"
+msgstr ""
+
+#: ../../advertising/05_IM_mageia.pl:1
+#, c-format
+msgid "Home entertainment"
+msgstr "家庭娱�"
+
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "U 盘上的桌�"
+msgid "For kids"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "100%% 开放�代�的 Mageia Linux �行版"
+msgid "For family!"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/08_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "用 Mageia One 轻�探索 Linux"
+msgid "For developers!"
+msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/09_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "Mageia Linux 桌�旗舰产�，附带完善的售��务支�"
+msgid "Thank you!"
+msgstr "谢谢�"
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/10_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia 在手，应用无忧"
+msgid "Be Free!"
+msgstr ""
 
-#: any.pm:109
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "您有其它赠�介质�?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -62,112 +92,177 @@ msgstr ""
 "\n"
 "您是�想��置赠�安装介质?"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "网络 (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "网络 (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "网络 (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "镜�的 URL?"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL 必须以 ftp:// 或 http:// 开始"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "正在连接 Mageia Linux 网站获得�用镜�的列表..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "正在连接 %s 网站获得�用镜�的列表..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr "连接 Mageia Linux 网站以获得�用镜�的列表失败"
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr "连接 %s 网站以获得�用镜�的列表失败"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "选择一个镜�网站��得软件包"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "NFS 设置"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "请输入您 NFS 介质的主机�和目录"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "缺少主机�"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "目录必须以“/�开头"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS 挂载的主机�？"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "目录"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "赠�"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "无法在此镜�上找到软件包列表文件。请确定�置正确。"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr ""
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr ""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr ""
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" 包��自由软件。\n"
+
+#: any.pm:477
+#, c-format
+msgid ""
+"It also contains firmwares needed for certain devices to operate (eg: some "
+"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
+msgstr ""
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr ""
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr ""
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr ""
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr ""
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "正在查找已�安装过的软件包..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "正在寻找��级的程�..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -180,87 +275,87 @@ msgstr ""
 "\n"
 "您确定�删除这些软件包�?\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "请�文件 %s 出错"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "下列盘片已�命�:"
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s(以�的�称为 %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "网络"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "请选择介质"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "文件已�存在。覆盖�?"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "没有��"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "无效的 NFS �称"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "无效的介质 %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "无法在分区完�之�进行�幕��"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "安装完��, 所有的�幕抓图都会�存到 %s 之中"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "安装"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "�置"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "您还必须格�化 %s"
@@ -284,22 +379,22 @@ msgstr "正在�动网络"
 msgid "Bringing down the network"
 msgstr "正在�用网络"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "请�候，正在获�文件"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "无法添加介质"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "正在将软件包�制到�盘中以备�用"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "�制进行中"
@@ -329,7 +424,22 @@ msgstr "一般"
 msgid "maybe"
 msgstr "或许有用"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr ""
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr "未找到介质“%s�的 XML 信�，�返回软件包 %s 的部分结果"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "无�述"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -338,335 +448,402 @@ msgstr ""
 "%s 所请求的�些软件包无法安装:\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "�生了一个错误:"
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "�生了一个致命错误: %s。"
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "���次询问"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 个安装交易失败"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "安装软件包失败:"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "工作站"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "办公工作站"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"办公程�: 字处�(OpenOffice.org Writer�Kword), 电�表格(OpenOffice.org "
-"Calc�Kspread)�PDF 阅读器等"
+"办公程�: 字处�(LibreOffice Writer�Kword), 电�表格(LibreOffice Calc�"
+"Kspread)�PDF 阅读器等"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "游�机"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "游�程�: 街机�棋盘�战略等等"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "多媒体工作站"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "声音和视频播放/编辑程�"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "Internet 工作站"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "一组工具, 用于收�电�邮件�新闻组(mutt, tin..), �览网站"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "网络计算机(客户端)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "SSH 等���议客户端"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "简化计算机�置的工具"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "控制�工具"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "编辑器, shell, 文件工具, 终端"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "开�"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "文档"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "有关 Linux 和自由软件的书�和指�"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base。第三方应用程�支�"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "Web �务器"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "群件"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab �务器"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "防�墙/路由器"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet 网关"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "邮件/新闻"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix 邮件�务器�Inn 新闻�务器"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "目录�务器"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP �务器"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "域�和网络信��务器"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "文件和打�机共享�务器"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "数�库"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL 和 MySQL 数�库�务"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL 和 MariaDB 数�库�务"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache 和 Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "邮件"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix 邮件�务器"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL 或 MySQL 数�库�务"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL 或 MariaDB 数�库�务"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "网络计算机�务器"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "图形环境"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE 工作站"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "KDE 桌�环境, 基本的图形环境和一组�套的工具"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 工作站"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, 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:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "XFCE 工作者"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "MATE工作站"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Cinnamon工作站"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "一�基于GNOME的图形环境"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "LXQT桌�"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Enlightenment e17 桌�"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE 桌�"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "一�轻�级的快速图形环境"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasma 桌�"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr "�备了用户�善的应用程�与桌�工具的轻�级图形环境"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "其它图形桌�"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker�Enlightenment�Fvwm 等"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, 等等"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "工具"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH �务器"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin 远程�置�务器"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "网络工具/监视"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "监视工具�进程统计�tcpdump�nmap……"
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia �导"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "�务器�置�导"
@@ -680,7 +857,7 @@ msgstr ""
 "�生错误, �是我�知�该怎样处��好。\n"
 "继续下去会怎样就看您的�气了。"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -699,249 +876,249 @@ msgstr "进入步骤“%s�\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux 安装 %s"
+msgid "%s Installation %s"
+msgstr "%s 安装 %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> �在元素间切�"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg �动很慢，请�候..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"您系统的资�过低。您在安装 Mageia Linux 的过程中�能�到问题。\n"
+"您系统的资�过低。您在安装 %s 的过程中�能�到问题。\n"
 "如果您真的�到问题的�，�以试试文本安装。�进入文本安装，请在�动时按“F1�，"
 "然�输入“text�。"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "安装 Mageia KDE 桌�"
+msgid "Media Selection"
+msgstr "介质选择"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "安装 Mageia GNOME 桌�"
+msgid "Install %s KDE Desktop"
+msgstr "安装 %s KDE 桌�"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "安装 %s GNOME 桌�"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "自定义安装"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE 桌�"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME 桌�"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "自定义桌�"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "这是“%s�桌�的预览。"
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "�击图��查看更大的预览"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "程�组选择"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "选择�个软件包"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "总共大�: %d / %d MB"
+msgid "Unselect All"
+msgstr "全部�选"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "有错的软件包"
+msgid "Total size: %d / %d MB"
+msgstr "总共大�: %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "大�: "
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "��程度: "
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "您�能改�这个软件包的选定"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "由于缺少 %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由于�满足的 %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "�试推广 %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了�留 %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "您��以选择这个软件包。没有足够空间安装它。"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "�将安装下列软件包"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "�将�载下列软件包"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "这个软件包是必需的, �能�消选定"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "您��以�消选择这个软件包。它已�安装过了"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "您�能�选择这个软件包。它必须�级"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "自动显示选中的软件包"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "安装"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "装入/�存选择"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "更新软件包选择"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "最�安装"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "软件管�"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "选择您想�安装的软件包"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "安装"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "无细节"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "剩余时间:"
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(正在估计...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d 个软件包"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "摘�"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "�置"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "未�置"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "介质选择"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -950,84 +1127,84 @@ msgstr ""
 "找到了下列安装介质。\n"
 "如果您想�跳过其中一些, 请��选中。"
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "您�以选择在安装之�将光盘的全部内容�制到硬盘中。\n"
 "然�，安装将会从硬盘继续进行。当系统安装完��，软件包�然�留，以供日�添加"
 "软件使用。"
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "�制整张光盘"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "�生了一个错误"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "请选择您使用的键盘布局。"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "在此列出了�用的全部键盘:"
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "安装/�级"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "现在�新装还是�级?"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "安装"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "�级 %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s 的加密密钥"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "�消安装，�新�动系统"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "全新安装"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "�级先�的安装(�推�)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1035,42 +1212,23 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"安装程�检测到您所安装的 Mageia Linux 系统无法安全�级到 %s。\n"
+"安装程�检测到您所安装的 Linux 系统无法安全�级到 %s。\n"
 "\n"
 "我们建议您进行全新安装，以便替�您先�的系统。\n"
 "\n"
 "警告：您在选择“全新安装�之�应该备份您所有的个人数�。"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "�置 IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"无法创建�动空间(1MB)�安装将继续, 但如需�动系统, 您�用“Drak �盘管��创建"
-"�动分区"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"您需�创建一个 PPC PReP �动空间�安装将继续, 但如需�动系统, 您�用“Drak �"
-"盘管��创建�动分区"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1083,19 +1241,19 @@ msgstr ""
 "请在驱动器中�入标有“%s�的光盘, 然��击“确定�。\n"
 "如果您没有这张光盘, 请�击“�消�, 放弃安装这张光盘上的软件。"
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "正在寻找�安装的程�..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr "系统的剩余空间�足以完�安装或�级(%d MB > %d MB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1104,139 +1262,163 @@ msgstr ""
 "请选择装入或�存软件包选择�。\n"
 "格�与自动安装生�的文件一样。"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "装入"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "�存"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "文件有错"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "桌�选择"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "您�以选择您的工作站�置文件："
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "您选择的超过�用空间"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "安装类型"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr "您没有选择任何的组件, 请选择最�安装:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "安装 X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "安装建议的软件包"
+msgid "Install recommended packages"
+msgstr "安装推�的软件包"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "安装基础文档(建议!)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "真正最�安装(注�没有 urpmi 包管�工具)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "�级准备中......"
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "正在准备安装"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "正在安装软件包 %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "排列软件包时出错: "
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "真的�继续?"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "�试"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "跳过此软件包"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "跳过介质“%s�中的全部软件包"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "返回介质和软件包选择"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "安装软件包 %s 时出错。"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "安装�的�置"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "请确定更新模�介质�于驱动器 %s"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "æ›´æ–°"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1255,124 +1437,114 @@ msgstr ""
 "\n"
 "您是��安装�级包?"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "�于 %2$s 上的 %1$s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "声�"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "您有 ISA 声��?"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "安装之��行“alsaconf�或“sndconfig���置您的声�"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "没有检测到声�。请在安装之��试“Drak 硬件�置�。"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "图形界�"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "网络和 Internet"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "代��务器"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "已�置"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "安全级别"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "防�墙"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "已激活"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "已�用"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您还没有�置过 X。您真的想�这样�?"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "正在准备引导程�..."
+msgid "Preparing initial startup program..."
+msgstr "正在准备安装�始安装程�..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "请�候，这�能需�一会儿..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"看�您用的是�掉牙或�认识的机器, yaboot �动引导程�无法为您工作。安装将继"
-"续, �过您需�使用 BootX 或其它方��动您的机器。根文件系统的内核�数是："
-"root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "在此安全级别中, �有管�员�能访问 Windows 分区中的文件。"
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "请在驱动器 %s 中�入一张空白软盘"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在创建自动安装软盘..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1383,12 +1555,12 @@ msgstr ""
 "\n"
 "您真的�现在退出�?"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "�喜"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "�新�动"
@@ -1483,13 +1655,6 @@ msgid ""
 "Users"
 msgstr "用户"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "�网"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
@@ -1532,9 +1697,5 @@ msgid ""
 "Exit"
 msgstr "退出"
 
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "办公程�: 字处�(kword�abiword), 电�表格(kspread�gnumeric)�pdf 阅读器"
-#~ "ç­‰"
+#~ msgid "Preparing bootloader..."
+#~ msgstr "正在准备引导程�..."
diff --git a/perl-install/install/share/po/zh_TW.po b/perl-install/install/share/po/zh_TW.po
index 11667c162..421e323af 100644
--- a/perl-install/install/share/po/zh_TW.po
+++ b/perl-install/install/share/po/zh_TW.po
@@ -1,70 +1,81 @@
-# translation of zh_TW.po to 正體中文
-# translation of zh_TW.po to Chinese Traditional
-# translation of DrakX-zh_TW.po to Chinese Traditional
-# drakbootdisk messages in Traditional Chinese
-# Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
-# Platin <platin@cle.linux.org.tw> , 2000
-# Kenduest Lee <kenduest@i18n.linux.org.tw> , 2002
-# Danny Zeng <danny@zeng.com.cn>, 2000.
-# Joe Man <trmetal@yahoo.com.hk>, 2001.
-# Chong Sein Yeo <csyeo@hal-pc.org>, 2003.
-# Hilbert <freehil@yahoo.com>, 2003, 2004.
-# Hilbert <h@mandrake.org>, 2004.
-# hilbert <h@mandrake.org>, 2004.
-# Shiva Huang <blueshiva@giga.net.tw>, 2005.
-# Shiva Huang <shivahuang@gmail.com>, 2005, 2006, 2008
-# You-Cheng Hsieh <yochenhsieh@xuite.net>, 2005, 2006.
-# You-Cheng Hsieh <yochenhsieh@gmail.com>, 2008.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# You-Cheng Hsieh <yochenhsieh@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX\n"
+"Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:50+0200\n"
-"PO-Revision-Date: 2008-10-01 10:02+0800\n"
-"Last-Translator: # You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
-"Language-Team: Traditional Chinese <zh@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"PO-Revision-Date: 2015-05-28 13:40+0000\n"
+"Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mageia/"
+"language/zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-Country: TAIWAN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "在 USB 上的桌�"
+msgid "Join Us!"
+msgstr ""
+
+#: ../../advertising/02_IM_mageia.pl:1
+#, c-format
+msgid "Make it yours!"
+msgstr ""
+
+#: ../../advertising/03_IM_mageia.pl:1
+#, c-format
+msgid "Your choice!"
+msgstr ""
 
-#: ../../advertising/IM_free.pl:1
+#: ../../advertising/04_IM_mageia.pl:1
 #, c-format
-msgid "The 100%% open source Mageia Linux distribution"
-msgstr "百分之百開放�碼 Mageia Linux 套件"
+msgid "Office tools"
+msgstr ""
 
-#: ../../advertising/IM_one.pl:1
+#: ../../advertising/05_IM_mageia.pl:1
 #, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "用 Mageia One 輕鬆探索 Linux"
+msgid "Home entertainment"
+msgstr ""
 
-#: ../../advertising/IM_pwp.pl:1
+#: ../../advertising/06_IM_mageia.pl:1
 #, c-format
-msgid "A full Mageia Linux desktop, with support"
-msgstr "完整的 Mageia Linux 桌�，並有支�"
+msgid "For kids"
+msgstr ""
 
-#: ../../advertising/IM_range.pl:1
+#: ../../advertising/07_IM_mageia.pl:1
 #, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia：�以符�所有使用者需求的套件"
+msgid "For family!"
+msgstr ""
 
-#: any.pm:109
+#: ../../advertising/08_IM_mageia.pl:1
+#, c-format
+msgid "For developers!"
+msgstr ""
+
+#: ../../advertising/09_IM_mageia.pl:1
+#, c-format
+msgid "Thank you!"
+msgstr ""
+
+#: ../../advertising/10_IM_mageia.pl:1
+#, c-format
+msgid "Be Free!"
+msgstr ""
+
+#: any.pm:151
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "您還有其他的補充媒介嗎?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:112
+#: any.pm:154
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -77,112 +88,179 @@ msgstr ""
 "\n"
 "您有其他的安�媒介需�設定嗎？"
 
-#: any.pm:120
+#: any.pm:162
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:121
+#: any.pm:163
 #, c-format
 msgid "Network (HTTP)"
 msgstr "網路 (HTTP)"
 
-#: any.pm:122
+#: any.pm:164
 #, c-format
 msgid "Network (FTP)"
 msgstr "網路 (FTP)"
 
-#: any.pm:123
+#: any.pm:165
 #, c-format
 msgid "Network (NFS)"
 msgstr "網路 (NFS)"
 
-#: any.pm:165
+#: any.pm:224
 #, c-format
 msgid "URL of the mirror?"
 msgstr "映�站的 URL？"
 
-#: any.pm:171
+#: any.pm:230
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL 開頭必須是 ftp:// 或 http://"
 
-#: any.pm:182
+#: any.pm:248
 #, c-format
-msgid ""
-"Contacting Mageia Linux web site to get the list of available mirrors..."
-msgstr "正在連�到 Mageia Linux 網站查詢�用的映射站�..."
+msgid "Contacting %s web site to get the list of available mirrors..."
+msgstr "請到 %s 網站�得映射站�清單..."
 
-#: any.pm:187
+#: any.pm:253
 #, c-format
-msgid ""
-"Failed contacting Mageia Linux web site to get the list of available mirrors"
-msgstr "無法連�到 Mageia Linux 網站�得�用的映射站�"
+msgid "Failed contacting %s web site to get the list of available mirrors"
+msgstr "到 %s 網站�得映射站�清單失敗"
 
-#: any.pm:197
+#: any.pm:263
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "���用來抓�程�套件檔的 FTP 映射站�"
 
-#: any.pm:227
+#: any.pm:293
 #, c-format
 msgid "NFS setup"
 msgstr "設定 NFS"
 
-#: any.pm:228
+#: any.pm:294
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "請輸入您的 NFS 媒介的主機和目錄�稱"
 
-#: any.pm:232
+#: any.pm:298
 #, c-format
 msgid "Hostname missing"
 msgstr "沒有主機�稱"
 
-#: any.pm:233
+#: any.pm:299
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "目錄必須以「/�開始"
 
-#: any.pm:237
+#: any.pm:303
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS 掛載點的主機�稱？"
 
-#: any.pm:238
+#: any.pm:304
 #, c-format
 msgid "Directory"
 msgstr "目錄"
 
-#: any.pm:260
+#: any.pm:334
 #, c-format
 msgid "Supplementary"
 msgstr "補充"
 
-#: any.pm:295
+#: any.pm:369
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "無法在這個映�站上找到套件列表檔。請確定��是正確的。"
 
-#: any.pm:334
+#: any.pm:394
+#, c-format
+msgid "Core Release"
+msgstr ""
+
+#: any.pm:396
+#, c-format
+msgid "Tainted Release"
+msgstr ""
+
+#: any.pm:398
+#, c-format
+msgid "Nonfree Release"
+msgstr ""
+
+#: any.pm:436
+#, c-format
+msgid ""
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
+msgstr "您的機器上的�些硬體需��自由的軔體�能夠讓自由的驅動程��作。"
+
+#: any.pm:437
+#, c-format
+msgid "You should enable \"%s\""
+msgstr "您應該啟用 \"%s\""
+
+#: any.pm:475
+#, c-format
+msgid "\"%s\" contains the various pieces of the systems and its applications"
+msgstr "\"%s\" 包��種系統元件和應用程�"
+
+#: any.pm:476
+#, c-format
+msgid "\"%s\" contains non free software.\n"
+msgstr "\"%s\" 包��自由的軟體套件。\n"
+
+#: any.pm:477
+#, 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介�"
+"�...)"
+
+#: any.pm:478
+#, c-format
+msgid ""
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
+msgstr "\"%s\" 包�因為軟體專利而無法在所有國家散佈的軟體套件。"
+
+#: any.pm:479
+#, c-format
+msgid ""
+"It also contains software from \"%s\" rebuild with additional capabilities."
+msgstr "它也包�了 \"%s\" 中以��方�編譯的軟體套件。"
+
+#: any.pm:485
+#, c-format
+msgid "Here you can enable more media if you want."
+msgstr "您�以在這裡啟用更多媒體。"
+
+#: any.pm:502
+#, c-format
+msgid "This medium provides package updates for medium \"%s\""
+msgstr "這個媒體包� \"%s\" 媒體的套件更新"
+
+#: any.pm:600
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "正在查看已經安��的套件..."
 
-#: any.pm:369
+#: any.pm:634
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "正在�尋��級的套件..."
 
-#: any.pm:388
+#: any.pm:653
 #, 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:594
+#: any.pm:881
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -195,87 +273,87 @@ msgstr ""
 "\n"
 "您確定�移除這些套件嗎？\n"
 
-#: any.pm:813
+#: any.pm:1096
 #, c-format
 msgid "Error reading file %s"
 msgstr "讀�檔案 %s 時發生錯誤"
 
-#: any.pm:1020
+#: any.pm:1304
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "下列�碟已經改�："
 
-#: any.pm:1022
+#: any.pm:1306
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (原本為 %s)"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1079
+#: any.pm:1363
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1098 steps_interactive.pm:938
+#: any.pm:1382 steps_interactive.pm:948
 #, c-format
 msgid "Network"
 msgstr "網路"
 
-#: any.pm:1102
+#: any.pm:1386
 #, c-format
 msgid "Please choose a media"
 msgstr "請�擇一個媒介"
 
-#: any.pm:1118
+#: any.pm:1402
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "檔案已經存在了。�覆蓋它嗎？"
 
-#: any.pm:1122
+#: any.pm:1406
 #, c-format
 msgid "Permission denied"
 msgstr "權��足"
 
-#: any.pm:1170
+#: any.pm:1454
 #, c-format
 msgid "Bad NFS name"
 msgstr "錯誤的 NFS �稱"
 
-#: any.pm:1191
+#: any.pm:1475
 #, c-format
 msgid "Bad media %s"
 msgstr "�壞的媒介 %s"
 
-#: any.pm:1234
+#: any.pm:1519
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "在尚未進行分割�無法�供畫���功能"
 
-#: any.pm:1242
+#: any.pm:1530
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "在安�後您�以於 %s �得螢幕截圖"
 
-#: gtk.pm:131
+#: gtk.pm:135
 #, c-format
 msgid "Installation"
 msgstr "安�"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:139 share/meta-task/compssUsers.pl:48
 #, c-format
 msgid "Configuration"
 msgstr "組態設定"
 
-#: install2.pm:168
+#: install2.pm:210
 #, c-format
 msgid "You must also format %s"
 msgstr "您也必須�格�化 %s"
@@ -299,22 +377,22 @@ msgstr "啟動網路"
 msgid "Bringing down the network"
 msgstr "關閉網路"
 
-#: media.pm:399
+#: media.pm:404
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "請�後，正在�回檔案"
 
-#: media.pm:717
+#: media.pm:712
 #, c-format
 msgid "unable to add medium"
 msgstr "無法新增媒體"
 
-#: media.pm:757
+#: media.pm:752
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "正在複製一些程�套件到�碟以供�後使用"
 
-#: media.pm:810
+#: media.pm:805
 #, c-format
 msgid "Copying in progress"
 msgstr "複製進行中"
@@ -344,7 +422,22 @@ msgstr "好的"
 msgid "maybe"
 msgstr "或許"
 
-#: pkgs.pm:239
+#: pkgs.pm:102
+#, c-format
+msgid "Getting package information from XML meta-data..."
+msgstr "正在從 XML 資料中�得套件資訊..."
+
+#: pkgs.pm:111
+#, c-format
+msgid "No xml info for medium \"%s\", only partial result for package %s"
+msgstr "\"%s\" 媒體沒有 XML 資訊，所以 %s 套件�會有部份內容�用"
+
+#: pkgs.pm:119
+#, c-format
+msgid "No description"
+msgstr "沒有�述"
+
+#: pkgs.pm:286
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -353,335 +446,402 @@ msgstr ""
 "無法安� %s �求的�些套件：\n"
 "%s"
 
-#: pkgs.pm:327
+#: pkgs.pm:382 pkgs.pm:409
 #, c-format
 msgid "An error occurred:"
 msgstr "發生一個錯誤："
 
-#: pkgs.pm:814
+#: pkgs.pm:401
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "發生了一個致命的錯誤：%s。"
+
+#: pkgs.pm:895 pkgs.pm:937
+#, c-format
+msgid "Do not ask again"
+msgstr "���詢�"
+
+#: pkgs.pm:911
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 個安�執行失敗"
 
-#: pkgs.pm:815
+#: pkgs.pm:912
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "安�套件失敗："
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Workstation"
 msgstr "工作站"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid "Office Workstation"
 msgstr "辦公軟體平�"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:20
 #, c-format
 msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
+"(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"辦公軟體：文書處�軟體 (OpenOffice.org Writer�Kword)�試算表 (OpenOffice."
-"org Calc�Kspread)�PDF 檢視器等等"
+"辦公軟體：文書處�軟體 (LibreOffice Writer�Kword)�試算表 (OpenOffice.org "
+"Calc�Kspread)�PDF 檢視器等等"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:26
 #, c-format
 msgid "Game station"
 msgstr "�戲平�"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "娛樂的一些程�：紙牌�益智�動作�策略等"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:30
 #, c-format
 msgid "Multimedia station"
 msgstr "多媒體平�"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "音效以�影�撥放編輯程�"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:36
 #, c-format
 msgid "Internet station"
 msgstr "網際網路平�"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:37
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr "包�讀信�寄信和閱讀新�群組 (mutt�tin ..) 以�網路�覽的工具"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Network Computer (client)"
 msgstr "網路電腦 (客戶端)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:43
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "包� ssh 等其他��通訊�定的用戶端程�"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "讓您方便設定您系統的工具"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:53
 #, c-format
 msgid "Console Tools"
 msgstr "Console 工具"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:54
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "編輯器�shell�檔案工具�終端機"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
+#: share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Development"
 msgstr "程�開發"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
 #, 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:63 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Documentation"
 msgstr "文件檔案"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Linux 系統與自由軟體的書��HOWTO 文件"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "LSB 的支�，包�第三類�力廠商軟體支�"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:79
 #, c-format
 msgid "Web Server"
 msgstr "網�伺�器 (Web)"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:80
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:84
 #, c-format
 msgid "Groupware"
 msgstr "群組軟體"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab 伺�器"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:88 share/meta-task/compssUsers.pl:138
 #, c-format
 msgid "Firewall/Router"
 msgstr "防�牆/路由器"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl:139
 #, c-format
 msgid "Internet gateway"
 msgstr "網際網路閘�器"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:92
 #, c-format
 msgid "Mail/News"
 msgstr "郵件/新�"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix 郵件伺�器，Inn 新�伺�器"
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "Directory Server"
 msgstr "目錄伺�器"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "FTP Server"
 msgstr "FTP 伺�器"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:103
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:107
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:108
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "網域�稱與網路資訊伺�器"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:112
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "檔案與列�分享伺�器"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:113
 #, 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:117 share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Database"
 msgstr "資料庫軟體"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:118
 #, c-format
-msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL 與 MySQL 資料庫伺�器"
+msgid "PostgreSQL and MariaDB Database Server"
+msgstr "PostgreSQL 與 MariaDB 資料庫伺�器"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:123
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:124
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache�ProFTPD"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:128
 #, c-format
 msgid "Mail"
 msgstr "電�郵件"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:129
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix 郵件伺�器"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL�MySQL 資料庫"
+msgid "PostgreSQL or MariaDB database server"
+msgstr "PostgreSQL�MariaDB 資料庫"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:142
 #, c-format
 msgid "Network Computer server"
 msgstr "網路伺�器"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:143
 #, 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:150
 #, c-format
 msgid "Graphical Environment"
 msgstr "圖形環境"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:152
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE 工作站"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:153
 #, 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:158
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 工作站"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl:170
 #, 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:164
+#, c-format
+msgid "XFCE Workstation"
+msgstr "XFCE 工作站"
+
+#: share/meta-task/compssUsers.pl:165
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr "一個包��善的應用程�和桌�工具的輕�圖形環境"
+
+#: share/meta-task/compssUsers.pl:169
+#, c-format
+msgid "MATE Workstation"
+msgstr "MATE 工作站"
+
+#: share/meta-task/compssUsers.pl:174
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Cinnamon 工作站"
+
+#: share/meta-task/compssUsers.pl:175
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "一個以 GNOME 為基礎的圖形環境"
+
+#: share/meta-task/compssUsers.pl:179
+#, c-format
+msgid "LXQT Desktop"
+msgstr "LXQT 桌�"
+
+#: share/meta-task/compssUsers.pl:181
+#, c-format
+msgid "A next generation QT port of the lightweight desktop environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:184
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Enlightenment e17 桌�"
+
+#: share/meta-task/compssUsers.pl:186
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:189
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE 桌�"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:191
+#, c-format
+msgid "A lightweight fast graphical environment"
+msgstr "一個輕�且快速的圖形環境"
+
+#: share/meta-task/compssUsers.pl:194
+#, c-format
+msgid "Plasma Desktop"
+msgstr "Plasma 桌�"
+
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid ""
-"A lightweight & fast graphical environment with user-friendly set of "
-"applications and desktop tools"
-msgstr "包��善的應用程��桌�軟體的輕�級圖型化使用環境"
+"The Plasma Desktop, the basic graphical environment with a collection of "
+"accompanying tools"
+msgstr ""
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "其他圖型桌�軟體"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:200
 #, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker�Enlightenment�Fvwm 等"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, ç­‰"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:223
 #, c-format
 msgid "Utilities"
 msgstr "工具軟體"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "SSH Server"
 msgstr "SSH 伺�主機"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin �端設定伺�器"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "網路工具/監控"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "監控工具�程�管��tcpdump�nmap..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:240
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia 精�"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:241
 #, c-format
 msgid "Wizards to configure server"
 msgstr "用來設定伺�器的精�"
@@ -695,7 +855,7 @@ msgstr ""
 "發生了一個錯誤，但我�知�該如何妥善處置它。\n"
 "�繼續安�工作的話請�心。"
 
-#: steps.pm:443
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -714,249 +874,248 @@ msgstr "進入步驟 `%s'\n"
 
 #: steps_curses.pm:22
 #, c-format
-msgid "Mageia Linux Installation %s"
-msgstr "Mageia Linux 安�程� %s"
+msgid "%s Installation %s"
+msgstr "%s 安� %s"
 
 #: steps_curses.pm:32
 #, c-format
 msgid "<Tab>/<Alt-Tab> between elements"
 msgstr "<Tab>/<Alt-Tab> 在元件間移動"
 
-#: steps_gtk.pm:89
+#: steps_gtk.pm:147
 #, c-format
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg 伺�器的啟動較為緩慢。請�候..."
 
-#: steps_gtk.pm:206
+#: steps_gtk.pm:212
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mageia Linux. If that occurs, you can try a text install instead. For this,\n"
+"%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"您的系統資�太少，�能會在安� Mageia Linux 的�程中�到�題。\n"
-"如果真的發生�題，您或許�以改用文字模�的安�方�來進行。\n"
-"�如此作的話，請在光碟開機時按下 `F1'，然後輸入 `text'。"
+"您的系統資��足，�能在安� %s 時會發生�題。如果真的發生�題，您�以試著改"
+"用文字介�安�。��在用光碟開機後的�單中按下 F1，並輸入 text ��。"
 
-#: steps_gtk.pm:239
+#: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
-msgid "Install Mageia KDE Desktop"
-msgstr "安� Mageia KDE 桌�"
+msgid "Media Selection"
+msgstr "�擇安�媒介"
 
-#: steps_gtk.pm:240
+#: steps_gtk.pm:253
 #, c-format
-msgid "Install Mageia GNOME Desktop"
-msgstr "安� Mageia GNOME 桌�"
+msgid "Install %s KDE Desktop"
+msgstr "安� %s KDE 桌�系統"
 
-#: steps_gtk.pm:241
+#: steps_gtk.pm:254
+#, c-format
+msgid "Install %s GNOME Desktop"
+msgstr "安� %s GNOME 桌�系統"
+
+#: steps_gtk.pm:255
 #, c-format
 msgid "Custom install"
 msgstr "自訂安�"
 
-#: steps_gtk.pm:262
+#: steps_gtk.pm:276
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE 桌�"
 
-#: steps_gtk.pm:263
+#: steps_gtk.pm:277
 #, c-format
 msgid "GNOME Desktop"
 msgstr "Gnome 桌�"
 
-#: steps_gtk.pm:264
+#: steps_gtk.pm:278
 #, c-format
 msgid "Custom Desktop"
 msgstr "自訂桌�"
 
-#: steps_gtk.pm:270
+#: steps_gtk.pm:284
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "這是 '%s' 桌�的�覽。"
 
-#: steps_gtk.pm:298
+#: steps_gtk.pm:311
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "在影�上點�以觀看較大的�覽畫�"
 
-#: steps_gtk.pm:316 steps_interactive.pm:609 steps_list.pm:30
+#: steps_gtk.pm:327 steps_interactive.pm:605 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "套件群組�擇"
 
-#: steps_gtk.pm:337 steps_interactive.pm:626
+#: steps_gtk.pm:350 steps_interactive.pm:622
 #, c-format
 msgid "Individual package selection"
 msgstr "單一套件��"
 
-#: steps_gtk.pm:361 steps_interactive.pm:546
+#: steps_gtk.pm:357
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "總共大�： %d / %d MB"
+msgid "Unselect All"
+msgstr "�消��所有項目"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:376 steps_interactive.pm:534
 #, c-format
-msgid "Bad package"
-msgstr "壞掉的套件"
+msgid "Total size: %d / %d MB"
+msgstr "總共大�： %d / %d MB"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "版本："
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "大�："
 
-#: steps_gtk.pm:406
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:407
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "��性："
 
-#: steps_gtk.pm:441
+#: steps_gtk.pm:458
 #, c-format
-msgid "You can not select/unselect this package"
+msgid "You cannot select/unselect this package"
 msgstr "您��以�擇/�消�擇這個套件"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "因為�失 %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由於沒有滿足 %s"
 
-#: steps_gtk.pm:447
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在嘗試促進 %s"
 
-#: steps_gtk.pm:448
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "為了�留 %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
-"You can not select this package as there is not enough space left to install "
+"You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "您��以��這個套件，因為剩餘的空間�足以安�它。"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "下列的套件將會被安�上"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "下列的套件將會被移除"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:500
 #, c-format
-msgid "This is a mandatory package, it can not be unselected"
+msgid "This is a mandatory package, it cannot be unselected"
 msgstr "這是一個必�的套件，您�能���它"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:502
 #, c-format
-msgid "You can not unselect this package. It is already installed"
+msgid "You cannot unselect this package. It is already installed"
 msgstr "您�能��這個套件。它已經被安�上了。"
 
-#: steps_gtk.pm:486
+#: steps_gtk.pm:504
 #, c-format
-msgid "You can not unselect this package. It must be upgraded"
+msgid "You cannot unselect this package. It must be upgraded"
 msgstr "您�能��這個套件，它一定�更新�行。"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "顯示自動被��的套件"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "安�"
 
-#: steps_gtk.pm:499
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "載入/儲存��"
 
-#: steps_gtk.pm:500
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "正在更新套件的�擇"
 
-#: steps_gtk.pm:505
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "最�安�"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "軟體套件管�"
 
-#: steps_gtk.pm:518 steps_interactive.pm:431
+#: steps_gtk.pm:534 steps_interactive.pm:415
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "�擇您想�安�的套件"
 
-#: steps_gtk.pm:535 steps_interactive.pm:640 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:642 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "正在安�"
 
-#: steps_gtk.pm:565
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
-msgstr "沒有詳細資訊"
+msgstr "�看詳細資訊"
 
-#: steps_gtk.pm:584
+#: steps_gtk.pm:600
 #, c-format
 msgid "Time remaining:"
 msgstr "剩餘時間："
 
-#: steps_gtk.pm:585
+#: steps_gtk.pm:601
 #, c-format
 msgid "(estimating...)"
 msgstr "(正在估計...)"
 
-#: steps_gtk.pm:615
+#: steps_gtk.pm:631
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d 個套件"
 
-#: steps_gtk.pm:670 steps_interactive.pm:804 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "總�"
 
-#: steps_gtk.pm:689
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "設定"
 
-#: steps_gtk.pm:706 steps_interactive.pm:800 steps_interactive.pm:950
+#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
 #, c-format
 msgid "not configured"
 msgstr "未被設定"
 
-#: steps_gtk.pm:740
-#, c-format
-msgid "Media Selection"
-msgstr "�擇安�媒介"
-
-#: steps_gtk.pm:749 steps_interactive.pm:332
+#: steps_gtk.pm:766 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -965,84 +1124,84 @@ msgstr ""
 "已經找到下列的安�媒介。\n"
 "如果您想略�它們，您�在�以將它們�消��。"
 
-#: steps_gtk.pm:765 steps_interactive.pm:338
+#: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
+"You have the option to copy the contents of the CDs onto the hard disk drive "
 "before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
+"It will then continue from the hard disk drive and the packages will remain "
 "available once the system is fully installed."
 msgstr ""
 "您�以�擇在安��將光碟的內容複製到硬碟。�候將會由硬碟繼續安�，並且這些套"
 "件\n"
 "在安�完畢之後�然�以繼續使用。"
 
-#: steps_gtk.pm:767 steps_interactive.pm:340
+#: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "複製整張光碟"
 
-#: steps_interactive.pm:39
+#: steps_interactive.pm:40
 #, c-format
 msgid "An error occurred"
 msgstr "發生一個錯誤"
 
-#: steps_interactive.pm:104
+#: steps_interactive.pm:105
 #, c-format
 msgid "Please choose your keyboard layout"
 msgstr "請���盤排列的樣�。"
 
-#: steps_interactive.pm:108
+#: steps_interactive.pm:109
 #, c-format
 msgid "Here is the full list of available keyboards:"
 msgstr "以下是所有�用的�盤清單："
 
-#: steps_interactive.pm:146
+#: steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "安�/�級"
 
-#: steps_interactive.pm:150
+#: steps_interactive.pm:157
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "這是安�或是�級？"
 
-#: steps_interactive.pm:152
+#: steps_interactive.pm:159
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "安�"
 
-#: steps_interactive.pm:154
+#: steps_interactive.pm:161
 #, c-format
 msgid "Upgrade %s"
 msgstr "�級 %s"
 
-#: steps_interactive.pm:172
+#: steps_interactive.pm:184
 #, c-format
 msgid "Encryption key for %s"
 msgstr "加密金鑰於 %s"
 
-#: steps_interactive.pm:205
+#: steps_interactive.pm:217
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "�消安�，�新開機"
 
-#: steps_interactive.pm:206
+#: steps_interactive.pm:218
 #, c-format
 msgid "New Installation"
 msgstr "新的安�"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:219
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "�級之�的安� (�建議)"
 
-#: steps_interactive.pm:211
+#: steps_interactive.pm:223
 #, c-format
 msgid ""
-"Installer has detected that your installed Mageia Linux system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1050,42 +1209,23 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"安�程��測到您安�的 Mageia Linux 系統無法安全地�級至 %s。\n"
+"安�器�測到您所安�的 Mageia Linux 系統無法安全地更新到 %s。\n"
 "\n"
-"建議用新的安��代您�有的系統。\n"
+"建議您�新安�，而��用�級的。\n"
 "\n"
-"警告：您應該在�擇「新的安��之�先備份所有個人資料。"
+"警告：在您�擇「新安��之�，您應該備份您所有的個人資料。"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:253
+#: steps_interactive.pm:264
 #, c-format
 msgid "Configuring IDE"
 msgstr "正在設定 IDE"
 
-#: steps_interactive.pm:290
-#, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"沒有足夠的�用空間安� bootstrap�安�還是會繼續，但是您必須在 DiskDrake\n"
-"中建立 bootstrap 分割來啟動您的系統"
-
-#: steps_interactive.pm:295
-#, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"您需�建立一個 PPC PReP 開機 bootstrap�安�還是會繼續，但是您必須在 "
-"DiskDrake 中建立 bootstrap 分割來啟動您的系統"
-
-#: steps_interactive.pm:371
+#: steps_interactive.pm:354
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1097,19 +1237,19 @@ msgstr ""
 "請�入標示為 \"%s\" 的光碟於您的光碟機中，完�後請按下確定。\n"
 "若是您沒有這片光碟，請點��消以略�這一片光碟的安�。"
 
-#: steps_interactive.pm:388
+#: steps_interactive.pm:372
 #, c-format
 msgid "Looking for available packages..."
 msgstr "正在�尋�以用的套件..."
 
-#: steps_interactive.pm:396
+#: steps_interactive.pm:380
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade "
 "(%dMB > %dMB)"
 msgstr "您的系統剩餘的空間�足以安�或�級 (%dMB > %dMB)"
 
-#: steps_interactive.pm:443
+#: steps_interactive.pm:428
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1118,52 +1258,52 @@ msgstr ""
 "請�擇�載入或者儲存套件�擇到�片上。\n"
 "它使用與自動安�所產生的�片相�的格�。"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Load"
 msgstr "載入"
 
-#: steps_interactive.pm:445
+#: steps_interactive.pm:430
 #, c-format
 msgid "Save"
 msgstr "儲存"
 
-#: steps_interactive.pm:453
+#: steps_interactive.pm:438
 #, c-format
 msgid "Bad file"
 msgstr "�壞的檔案"
 
-#: steps_interactive.pm:469
+#: steps_interactive.pm:455
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:456
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:459
 #, c-format
 msgid "Desktop Selection"
 msgstr "桌�環境�擇"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:460
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "您�以�擇您工作站的桌�環境："
 
-#: steps_interactive.pm:560
+#: steps_interactive.pm:548
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "所��的大�超��用的空間"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "安�類型"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1172,87 +1312,113 @@ msgstr ""
 "您並未��任何套件群組。\n"
 "請�擇您想�的最�安�："
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "包� X 環境"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
-msgid "Install suggested packages"
-msgstr "安�建議套件"
+msgid "Install recommended packages"
+msgstr "安�建議的套件"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "包�基本的說明文件 (建議的�)"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:581
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "真正最�安� (尤其無 urpmi)"
 
-#: steps_interactive.pm:641
+#: steps_interactive.pm:633
+#, c-format
+msgid "Preparing upgrade..."
+msgstr "正在準備�級..."
+
+#: steps_interactive.pm:643
 #, c-format
 msgid "Preparing installation"
 msgstr "正在準備安�"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Installing package %s"
 msgstr "正在安�套件 %s"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "排列套件時發生錯誤："
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:675
 #, c-format
 msgid "Go on anyway?"
 msgstr "無論如何都�繼續嗎？"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:679
 #, c-format
 msgid "Retry"
 msgstr "�試"
 
-#: steps_interactive.pm:678
+#: steps_interactive.pm:680
 #, c-format
 msgid "Skip this package"
 msgstr "略�這個套件"
 
-#: steps_interactive.pm:679
+#: steps_interactive.pm:681
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "略�所有 %s 媒體的套件"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:682
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "回到媒體與套件�擇"
 
-#: steps_interactive.pm:683
+#: steps_interactive.pm:685
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "安� %s 套件時發生錯誤。"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:704
 #, c-format
 msgid "Post-install configuration"
 msgstr "安�後的設定"
 
-#: steps_interactive.pm:709
+#: steps_interactive.pm:711
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "請確定更新模組媒介�於�碟機 %s 中"
 
-#: steps_interactive.pm:737 steps_list.pm:47
+#: steps_interactive.pm:739 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "æ›´æ–°"
 
-#: steps_interactive.pm:738
+#: steps_interactive.pm:740
+#, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr "您�在有機會設定線上套件來�。"
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr "這能讓您安�安全更新。"
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+"�設定這些來�，您需�有��作的網路連線。\n"
+"您想�設定更新來�嗎?"
+
+#: steps_interactive.pm:764
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1271,125 +1437,114 @@ msgstr ""
 "\n"
 "您想�安�更新嗎？"
 
-#: steps_interactive.pm:846
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:853
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s 上的 %1$s"
 
-#: steps_interactive.pm:878 steps_interactive.pm:885 steps_interactive.pm:898
-#: steps_interactive.pm:915 steps_interactive.pm:930
+#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
+#: steps_interactive.pm:925 steps_interactive.pm:940
 #, c-format
 msgid "Hardware"
 msgstr "硬體"
 
-#: steps_interactive.pm:899 steps_interactive.pm:916
+#: steps_interactive.pm:909 steps_interactive.pm:926
 #, c-format
 msgid "Sound card"
 msgstr "音效�"
 
-#: steps_interactive.pm:919
+#: steps_interactive.pm:929
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "您有 ISA 音效�嗎？"
 
-#: steps_interactive.pm:921
+#: steps_interactive.pm:931
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "請在安�完畢後，執行 \"alsaconf\" 或 \"sndconfig\" 來設定您的音效�"
 
-#: steps_interactive.pm:923
+#: steps_interactive.pm:933
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "沒�測到任何音效�。請在安�後嘗試 \"harddrake\" 進行設定"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:941
 #, c-format
 msgid "Graphical interface"
 msgstr "圖形介�"
 
-#: steps_interactive.pm:937 steps_interactive.pm:948
+#: steps_interactive.pm:947 steps_interactive.pm:959
 #, c-format
 msgid "Network & Internet"
 msgstr "網路與網際網路"
 
-#: steps_interactive.pm:949
+#: steps_interactive.pm:960
 #, c-format
 msgid "Proxies"
 msgstr "代�伺�器"
 
-#: steps_interactive.pm:950
+#: steps_interactive.pm:961
 #, c-format
 msgid "configured"
 msgstr "已設定"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:971
 #, c-format
 msgid "Security Level"
 msgstr "安全層級"
 
-#: steps_interactive.pm:979
+#: steps_interactive.pm:991
 #, c-format
 msgid "Firewall"
 msgstr "防�牆"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "activated"
 msgstr "已啟用"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:995
 #, c-format
 msgid "disabled"
 msgstr "已�用"
 
-#: steps_interactive.pm:997
+#: steps_interactive.pm:1009
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您尚未設定 X。您確定您真的�這樣�？"
 
-#: steps_interactive.pm:1026
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
-msgid "Preparing bootloader..."
-msgstr "正在準備開機載入程�..."
+msgid "Preparing initial startup program..."
+msgstr "正在準備�始化啟動程�..."
 
-#: steps_interactive.pm:1027
+#: steps_interactive.pm:1041
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "請�心等候，這�花一些時間..."
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"您的系統似乎有 OldWorld 或者是其他��識的機器，\n"
-"這將會導致 yaboot 開機載入器無法正常�作。\n"
-"安�還是會繼續下去，��您將需�使用 bootX 或�些其他方法來啟動您的機器。"
-"root fs 的核心�數是：root=%s"
-
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1057
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "在這個安全層級中，�有管�者能夠存��於 Windows 分割�的檔案。"
 
-#: steps_interactive.pm:1083
+#: steps_interactive.pm:1089
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "請在 %s 中�入一片空白�片"
 
-#: steps_interactive.pm:1085
+#: steps_interactive.pm:1091
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在製作自動安��片..."
 
-#: steps_interactive.pm:1096
+#: steps_interactive.pm:1102
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1400,12 +1555,12 @@ msgstr ""
 "\n"
 "您確定���安�程�？"
 
-#: steps_interactive.pm:1106
+#: steps_interactive.pm:1112
 #, c-format
 msgid "Congratulations"
 msgstr "�喜"
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1115
 #, c-format
 msgid "Reboot"
 msgstr "�新開機"
@@ -1500,13 +1655,6 @@ msgid ""
 "Users"
 msgstr "使用者"
 
-#: steps_list.pm:36 steps_list.pm:37
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Networking"
-msgstr "網路"
-
 #: steps_list.pm:38 steps_list.pm:39
 #, c-format
 msgid ""
diff --git a/perl-install/install/share/runinstall2.sh b/perl-install/install/share/runinstall2.sh
new file mode 100644
index 000000000..014f5fd5d
--- /dev/null
+++ b/perl-install/install/share/runinstall2.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "Starting Udev\n"
+perl -I/usr/lib/libDrakX -Minstall::install2 -e "install::install2::start_udev()"
+echo "You can start the installer by running install2"
+echo "You can run it in GDB by running gdb-inst"
+/usr/bin/busybox sh
+exec install2 $@
diff --git a/perl-install/install/share/symlinks b/perl-install/install/share/symlinks
index 93f193391..dad5e65b0 100644
--- a/perl-install/install/share/symlinks
+++ b/perl-install/install/share/symlinks
@@ -1,14 +1,8 @@
-/sbin
-/bin
 /etc/mke2fs.conf
 /etc/protocols
 /etc/services
 /etc/group
+/etc/machine-id
 /etc/passwd
 /etc/pki
-/etc/termcap
 /etc/urpmi
-/lib
-/lib64
-/usr
-/tmp /var/run
diff --git a/perl-install/install/share/upgrade/.gitignore b/perl-install/install/share/upgrade/.gitignore
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/perl-install/install/share/upgrade/.gitignore
@@ -0,0 +1 @@
+
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index ca9281822..96b40b314 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -1,4 +1,4 @@
-package install::steps; # $Id: steps.pm 268013 2010-04-29 15:02:04Z pterjan $
+package install::steps;
 
 use diagnostics;
 use strict;
@@ -176,9 +176,10 @@ sub selectInstallClass {
 #------------------------------------------------------------------------------
 sub doPartitionDisksBefore {
     my ($o) = @_;
+    log::l("fdisk before:\n" . `fdisk -l`);
     eval { 
+	eval { fs::mount::umount("$::prefix/sys/kernel/debug/usb") };
 	eval { fs::mount::umount("$::prefix/sys") };
-	eval { fs::mount::umount("$::prefix/proc/bus/usb") };
 	eval { fs::mount::umount("$::prefix/proc") };
 	eval {          fs::mount::umount_all($o->{fstab}) };
 	eval { sleep 1; fs::mount::umount_all($o->{fstab}) } if $@; #- HACK
@@ -190,6 +191,7 @@ sub doPartitionDisksAfter {
     my ($o) = @_;
 
     fs::any::write_hds($o->{all_hds}, $o->{fstab}, !$o->{isUpgrade}, sub { $o->rebootNeeded }, $o);
+    log::l("fdisk after\n" . `fdisk -l`);
 
     if ($::local_install) {
 	my $p = fs::get::mntpoint2part($::prefix, [ fs::read_fstab('', '/proc/mounts') ]);
@@ -258,6 +260,9 @@ sub selectSupplMedia { '' }
 sub choosePackages {
     my ($o, $o_compssListLevel) = @_;
 
+    #- clear the mirror cache before upgrading:
+    eval { rm_rf("$::prefix/var/cache/urpmi/mirrors.cache") };
+ 
     #- now for upgrade, package that must be upgraded are
     #- selected first, after is used the same scheme as install.
 
@@ -274,12 +279,9 @@ sub choosePackages {
     $availableCorrected;
 }
 
-sub upgrading_redhat() {
-    #- remove weird config files that bother Xconfig::* too much
-    unlink "$::prefix/etc/X11/XF86Config";
-    unlink "$::prefix/etc/X11/XF86Config-4";
+sub live_patch_URPM() {
 
-    sub prefering_mdv {
+    sub prefering_mga {
 	my ($lpkg, $rpkg_ver, $c) = @_;
 	my $lpkg_ver = $lpkg->version . '-' . $lpkg->release;
 	log::l($lpkg->name . ' ' . ': prefering ' . ($c == 1 ? "$lpkg_ver over $rpkg_ver" : "$rpkg_ver over $lpkg_ver"));
@@ -289,9 +291,9 @@ sub upgrading_redhat() {
     undef *URPM::Package::compare_pkg;
     *URPM::Package::compare_pkg = sub {
 	my ($lpkg, $rpkg) = @_;
-	my $c = ($lpkg->release =~ /mdv|mnb|mga/ ? 1 : 0) - ($rpkg->release =~ /mdv|mnb|mga/ ? 1 : 0);
+	my $c = ($lpkg->release =~ /mga/ ? 1 : 0) - ($rpkg->release =~ /mga/ ? 1 : 0);
 	if ($c) {
-	    prefering_mdv($lpkg, $rpkg->version . '-' . $rpkg->release, $c);
+	    prefering_mga($lpkg, $rpkg->version . '-' . $rpkg->release, $c);
 	    $c;
 	} else {
 	    &$old_compare_pkg;
@@ -302,15 +304,21 @@ sub upgrading_redhat() {
     undef *URPM::Package::compare;
     *URPM::Package::compare = sub {
 	my ($lpkg, $rpkg_ver) = @_;
-	my $c = ($lpkg->release =~ /mdv|mnb|mga/ ? 1 : 0) - ($rpkg_ver =~ /mdv|mnb|mga/ ? 1 : 0);
+	my $c = ($lpkg->release =~ /mga/ ? 1 : 0) - ($rpkg_ver =~ /mga/ ? 1 : 0);
 	if ($c) {
-	    prefering_mdv($lpkg, $rpkg_ver, $c);
+	    prefering_mga($lpkg, $rpkg_ver, $c);
 	    return $c;
 	}
 	&$old_compare;
     };
 }
 
+sub upgrading_redhat() {
+    #- remove weird config files that bother Xconfig::* too much
+    unlink "$::prefix/etc/X11/XF86Config";
+    unlink "$::prefix/etc/X11/XF86Config-4";
+}
+
 sub beforeInstallPackages {
     my ($o) = @_;
 
@@ -318,10 +326,8 @@ sub beforeInstallPackages {
 
     if ($o->{isUpgrade}) {
 	$o->{modules_conf}->merge_into(modules::any_conf->read);
-    }
 
-    #- save these files in case of upgrade failure.
-    if ($o->{isUpgrade}) {
+	#- save these files in case of upgrade failure.
 	foreach (@filesToSaveForUpgrade) {
 	    unlink "$::prefix/$_.mdkgisave";
 	    if (-e "$::prefix/$_") {
@@ -331,6 +337,14 @@ sub beforeInstallPackages {
 	foreach (@filesNewerToUseAfterUpgrade) {
 	    unlink "$::prefix/$_.rpmnew";
 	}
+
+	log::l("converting filesystem for usrmove");
+	if (!run_program::run('/usr/lib/dracut/modules.d/30convertfs/convertfs.sh', $::prefix)) {
+	    mkdir_p("$::prefix/root/drakx") if ! -d "$::prefix/root/drakx";
+	    # logs are only copied to $::prefix/root/drakx at the end of each step, so do it manually now
+	    eval { cp_af("/tmp/ddebug.log", "$::prefix/root/drakx") };
+	    die "Unable to convert filesystem prior to upgrade. Check ddebug.log for details";
+	}
     }
 
     #- mainly for upgrading redhat packages, but it can help other
@@ -342,6 +356,8 @@ sub beforeInstallPackages {
 		    );
     rm_rf(@to_remove);
 
+    live_patch_URPM() if $o->{isUpgrade} !~ /mageia/;
+
     if ($o->{isUpgrade} eq 'redhat') {
 	upgrading_redhat();
     }
@@ -355,18 +371,17 @@ sub beforeInstallPackages {
     #- some packages need such files for proper installation.
     install::any::write_fstab($o);
 
-    require network::network;
-    network::network::add2hosts("localhost", "127.0.0.1");
-
     #- resolv.conf will be modified at boot time
     #- the following will ensure we have a working DNS during install
     if (-e "/etc/resolv.conf" && ! -e "$::prefix/etc/resolv.conf") {
 	cp_af("/etc/resolv.conf", "$::prefix/etc");
     }
 
-    if (-e '/tmp/.X11-unix') {
-	mkdir "$::prefix/tmp/.X11-unix";
-	run_program::run('mount', '--bind', '/tmp/.X11-unix', "$::prefix/tmp/.X11-unix");
+    foreach ('/run', '/tmp/.X11-unix') {
+	if (-e $_) {
+	   mkdir "$::prefix/$_";
+	   run_program::run('mount', '--bind', $_, "$::prefix/$_");
+	}
     }
 
     log::l("setting excludedocs to $o->{excludedocs}");
@@ -417,6 +432,7 @@ sub installPackages {
     #- small transaction will be built based on this selection and depslist.
     my @toInstall = install::pkgs::packagesToInstall($packages);
 
+    my $exit_code;
     my $time = time();
     { 
 	local $ENV{DURING_INSTALL} = 1;
@@ -424,13 +440,14 @@ sub installPackages {
 	local $ENV{TMP} = '/tmp';
 	local $ENV{HOME};
 	local $packages->{options}{auto} = !$o_interactive;
-	install::pkgs::install($o->{isUpgrade}, \@toInstall, $packages, \&installCallback);
+	$exit_code = install::pkgs::install($o->{isUpgrade}, \@toInstall, $packages, \&installCallback);
     }
     any::writeandclean_ldsoconf($::prefix);
 
-    run_program::rooted_or_die($::prefix, 'ldconfig');
-
     log::l("Install took: ", formatTimeRaw(time() - $time));
+    run_program::rooted_or_die($::prefix, 'ldconfig') if !$o->{justdb};
+
+    $exit_code and die "Installation failed";
     install::media::log_sizes();
     scalar(@toInstall); #- return number of packages installed.
 }
@@ -445,7 +462,7 @@ Either your cdrom drive or your cdrom is defective.
 Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"
 ") if any { m|read failed: Input/output error| } cat_("$::prefix/root/drakx/install.log");
 
-    if (arch() !~ /^sparc/) { #- TODO restore it as may be needed for sparc
+    if (!$o->{justdb}) {
 	-x "$::prefix/usr/bin/dumpkeys" or $::testing or die 
 "Some important packages did not get installed properly.
 
@@ -468,7 +485,7 @@ Consoles 1,3,4,7 may also contain interesting information";
     harddrake::autoconf::cpufreq();
     harddrake::autoconf::floppy();
 
-    #- for mageia_firstime
+    #- for mandrake_firstime
     touch "$::prefix/var/lock/TMP_1ST";
 
     fs::any::set_cdrom_symlink($o->{all_hds}{raw_hds});
@@ -478,11 +495,6 @@ Consoles 1,3,4,7 may also contain interesting information";
     #- else if eth0 is not existing, glibc segfaults.
     substInFile { s/\s*wins// if /^\s*hosts\s*:/ } "$::prefix/etc/nsswitch.conf";
 
-    #- make sure some services have been enabled (or a catastrophic restart will occur).
-    #- these are normally base package post install scripts or important services to start.
-    run_program::rooted($::prefix, "chkconfig", "--add", $_) foreach
-			qw(netfs network rawdevices sound kheader keytable syslog crond portmap);
-
     if ($o->{mouse}{device} =~ /ttyS/) {
 	log::l("disabling gpm for serial mice (does not get along nicely with X)");
 	run_program::rooted($::prefix, "chkconfig", "--del", "gpm"); 
@@ -630,7 +642,8 @@ sub configureNetwork {
     my ($o) = @_;
     require network::network;
     network::network::configure_network($o->{net}, $o, $o->{modules_conf});
-    configure_firewall($o) if !$o->{isUpgrade};
+
+    configure_firewall($o) if !$o->{isUpgrade} && !$o->{justdb};
 
     #- only a http proxy can be used by stage1
     #- the method is http even for ftp connections through a http proxy
@@ -678,7 +691,14 @@ sub configureTimezone {
     my ($o) = @_;
     install::any::preConfigureTimezone($o);
 
-    $o->pkg_install('ntp') if $o->{timezone}{ntp};
+    if ($o->{timezone}{ntp}) {
+        # We prefer chrony, but we'll deal with ntpd for the sake of upgrades
+        my $pkg = install::pkgs::packageByName($o->{packages}, 'chrony');
+        unless ($pkg && $pkg->flag_installed) {
+            $pkg = install::pkgs::packageByName($o->{packages}, 'ntp');
+            $o->pkg_install('chrony') unless ($pkg && $pkg->flag_installed);
+       }
+    }
 
     require timezone;
     timezone::write($o->{timezone});
@@ -726,7 +746,7 @@ sub addUser {
         $autologin->{user} = $o->{autologin};
         $autologin->{desktop} = $o->{desktop} if $o->{desktop};
         $autologin->{dm} = $o->{dm} if $o->{dm};
-        any::set_autologin($o->do_pkgs, $autologin);
+        any::set_autologin($o->do_pkgs, $autologin, $o->{step}{auto});
     }
 
     install::any::disable_user_view() if @$users == ();
@@ -745,8 +765,9 @@ sub read_bootloader_config {
 
 sub setupBootloaderBefore {
     my ($o) = @_;
+    my $bool = $o->{meta_class} ne 'server';
     any::setupBootloaderBefore($o->do_pkgs, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{keyboard},
-                               $o->{allowFB}, $o->{vga}, $o->{meta_class} ne 'server');
+                               $o->{allowFB}, $o->{vga}, $bool, $bool);
 }
 
 sub setupBootloader {
@@ -804,7 +825,7 @@ sub miscellaneousAfter {
     addToBeDone {
 	addVarsInSh("$::prefix/etc/sysconfig/system", { META_CLASS => $o->{meta_class} });
 
-	eval { install::any::set_security($o) };
+	eval { install::any::set_security($o) } if !$o->{isUpgrade};
 
     } 'installPackages';
 }
@@ -824,18 +845,18 @@ sub exitInstall {
 	my $report = '/root/drakx/report.bug';
 	unlink "$::prefix$report", "$::prefix$report.gz";
 	output "$::prefix$report", install::any::report_bug();
-	run_program::rooted($::prefix, 'gzip', $report);
+	run_program::rooted($::prefix, 'xz', $report);
     };
     output("$::prefix/root/drakx/package_list.pl", install::any::selected_leaves_pl($o));
 
-    eval { install::any::getAndSaveAutoInstallFloppies($o, 1) } if arch() !~ /^ppc/;
-    eval { output "$::prefix/root/drakx/README", "This directory contains several installation-related files,
+    eval { install::any::getAndSaveAutoInstallFloppies($o, 1) };
+    eval { output "$::prefix/root/drakx/README", sprintf("This directory contains several installation-related files,
 mostly log files (very useful if you ever report a bug!).
 
 Beware that some %s tools rely on the contents of some
 of these files... so remove any file from here at your own
 risk!
-" };
+", "Mageia") };
     #- wait for remaining processes.
     foreach (@{$o->{waitpids}}) {
 	waitpid $_, 0;
diff --git a/perl-install/install/steps_auto_install.pm b/perl-install/install/steps_auto_install.pm
index 1716fad06..ceaab7ed3 100644
--- a/perl-install/install/steps_auto_install.pm
+++ b/perl-install/install/steps_auto_install.pm
@@ -1,4 +1,4 @@
-package install::steps_auto_install; # $Id: steps_auto_install.pm 257077 2009-04-24 14:18:27Z blino $
+package install::steps_auto_install;
 
 use diagnostics;
 use strict;
diff --git a/perl-install/install/steps_curses.pm b/perl-install/install/steps_curses.pm
index 6f8f73579..30fd693a6 100644
--- a/perl-install/install/steps_curses.pm
+++ b/perl-install/install/steps_curses.pm
@@ -1,4 +1,4 @@
-package install::steps_curses; # $Id: steps_curses.pm 247958 2008-10-08 15:19:32Z tv $
+package install::steps_curses;
 
 use diagnostics;
 use strict;
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index e4b896371..999120e91 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -1,4 +1,4 @@
-package install::steps_gtk; # $Id: steps_gtk.pm 266069 2010-02-09 19:47:35Z pterjan $
+package install::steps_gtk;
 
 use diagnostics;
 use strict;
@@ -15,8 +15,8 @@ use install::steps_interactive;
 use interactive::gtk;
 use xf86misc::main;
 use common;
-use mygtk2;
-use ugtk2 qw(:helpers :wrappers :create);
+use mygtk3;
+use ugtk3 qw(:helpers :wrappers :create);
 use devices;
 use modules;
 use install::gtk;
@@ -36,95 +36,9 @@ sub new($$) {
 
     if (!$::local_install && 
 	($::testing ? $ENV{DISPLAY} ne $wanted_DISPLAY : $ENV{DISPLAY} =~ /^:\d/)) { #- is the display local or distant?
-	my $f = "/tmp/Xconf";
-	if (!$::testing) {
-	    devices::make("/dev/kbd");
-	}
-
-	#- /tmp is mostly tmpfs, but not fully, since it doesn't allow: mount --bind /tmp/.X11-unix /mnt/tmp/.X11-unix
-	mkdir '/tmp/.X11-unix';
-	run_program::run('mount', '-t', 'tmpfs', 'none', '/tmp/.X11-unix');
-
-	my $launchX = sub {
-	    my ($server, $Driver) = @_;
-
-	    mkdir '/var/log' if !-d '/var/log';
-
-	    my @options = $wanted_DISPLAY;
-	    if ($server eq 'Xnest') {
-		push @options, '-ac', '-geometry', $o->{vga} || ($o->{vga16} ? '640x480' : '800x600');
-	    } else {
-		install::gtk::createXconf($f, @{$o->{mouse}}{'Protocol', 'device'}, $o->{mouse}{wacom}[0], $Driver);
-
-		push @options, '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/;
-		push @options, 'vt7', '-dpi', '75';
-		push @options, '-nolisten', 'tcp';
-
-		#- old weird servers: Xsun
-		push @options, '-fp', '/usr/share/fonts:unscaled' if $server =~ /Xsun/;
-	    }
-
-	    if (!fork()) {
-		c::setsid();
-		exec $server, @options or c::_exit(1);
-	    }
-
-	    #- wait for the server to start
-	    foreach (1..5) {
-		sleep 1;
-		last if fuzzy_pidofs(qr/\b$server\b/);
-		log::l("$server still not running, trying again");
-	    }
-	    my $nb;
-	    my $start_time = time();
-	    foreach (1..60) {
-		log::l("waiting for the server to start ($_ $nb)");
-		log::l("Server died"), return 0 if !fuzzy_pidofs(qr/\b$server\b/);
-		$nb++ if xf86misc::main::Xtest($wanted_DISPLAY);
-		if ($nb > 2) { #- one succeeded test is not enough :-(
-		    log::l("AFAIK X server is up");
-		    return 1;
-		}
-		time() - $start_time < 60 or last;
-		time() - $start_time > 8 and print N("Xorg server is slow to start. Please wait..."), "\n";
-		sleep 1;
-	    }
-	    log::l("Timeout!!");
-	    0;
-	};
-	my @servers = qw(Driver:fbdev Driver:vesa); #-)
-	if ($::testing) {
-	    @servers = 'Xnest';
-	} elsif (arch() =~ /ia64/) {
-	    require Xconfig::card;
-	    my ($card) = Xconfig::card::probe();
-	    @servers = map { if_($_, "Driver:$_") } $card && $card->{Driver}, 'fbdev';
-	} elsif (arch() =~ /i.86/) {
-	    require Xconfig::card;
-	    my ($card) = Xconfig::card::probe();
-	    if ($card && $card->{card_name} eq 'i810') {
-		# early i810 do not support VESA:
-		log::l("graphical installer not supported on early i810");
-		undef @servers;
-	    }
-        }
-
-	foreach (@servers) {
-	    log::l("Trying with server $_");
-	    my ($prog, $Driver) = /Driver:(.*)/ ? ('Xorg', $1) : /Xsun|Xnest|^X_move$/ ? $_ : "XF86_$_";
-	    if (/FB/i) {
-		!$o->{vga16} && $o->{allowFB} or next;
-
-		$o->{allowFB} = &$launchX($prog, $Driver) #- keep in mind FB is used.
-		  and goto OK;
-	    } else {
-		$o->{vga16} = 1 if /VGA16/;
-		&$launchX($prog, $Driver) and goto OK;
-	    }
-	}
-	return undef;
+        _setup_and_start_X($o, $wanted_DISPLAY) or return;
     }
-  OK:
+
     $ENV{DISPLAY} = $wanted_DISPLAY;
     require detect_devices;
     if (detect_devices::is_xbox()) {
@@ -139,13 +53,105 @@ sub new($$) {
     install::gtk::create_steps_window($o);
     _may_configure_framebuffer_640x480($o);
 
-    $ugtk2::grab = 1;
+    $ugtk3::grab = 1;
 
     $o = (bless {}, ref($type) || $type)->SUPER::new($o);
     $o->interactive::gtk::new;
     $o;
 }
 
+sub _setup_and_start_X {
+    my ($o, $wanted_DISPLAY) = @_;
+    my $f = "/tmp/Xconf";
+
+    #- /tmp is mostly tmpfs, but not fully, since it doesn't allow: mount --bind /tmp/.X11-unix /mnt/tmp/.X11-unix
+    mkdir '/tmp/.X11-unix';
+    run_program::run('mount', '-t', 'tmpfs', 'none', '/tmp/.X11-unix');
+
+
+    my @servers = qw(Driver:fbdev Driver:vesa); #-)
+    if ($::testing) {
+        @servers = 'Xnest';
+    } elsif ( is_uefi() ) {
+        require Xconfig::card;
+        my ($card) = Xconfig::card::probe();
+        @servers = 'Driver:fbdev';
+    } elsif (arch() =~ /i.86/) {
+        require Xconfig::card;
+        my ($card) = Xconfig::card::probe();
+        if ($card && $card->{card_name} eq 'i810') {
+            # early i810 do not support VESA:
+            log::l("graphical installer not supported on early i810");
+            undef @servers;
+        }
+    }
+
+    foreach (@servers) {
+        log::l("Trying with server $_");
+        my ($prog, $Driver) = /Driver:(.*)/ ? ('Xorg', $1) : $_;
+        if (/FB/i) {
+            !$o->{vga16} && $o->{allowFB} or next;
+
+            $o->{allowFB} = _launchX($o, $f, $prog, $Driver, $wanted_DISPLAY) #- keep in mind FB is used.
+              and return 1;
+        } else {
+            $o->{vga16} = 1 if /VGA16/;
+            _launchX($o, $f, $prog, $Driver, $wanted_DISPLAY) and return 1;
+        }
+    }
+    return undef;
+}
+
+sub _launchX {
+    my ($o, $f, $server, $Driver, $wanted_DISPLAY) = @_;
+
+    mkdir '/var/log' if !-d '/var/log';
+
+    my @options = $wanted_DISPLAY;
+    if ($server eq 'Xnest') {
+        push @options, '-ac', '-geometry', $o->{vga} || ($o->{vga16} ? '640x480' : '800x600');
+    } else {
+        install::gtk::createXconf($f, $Driver);
+
+        push @options, '-allowMouseOpenFail', '-xf86config', $f;
+        push @options, 'vt7', '-dpi', '75';
+        push @options, '-nolisten', 'tcp';
+    }
+
+    if (!fork()) {
+        c::setsid();
+        exec $server, @options or c::_exit(1);
+    }
+
+    #- wait for the server to start
+    foreach (1..5) {
+        sleep 1;
+        last if fuzzy_pidofs(qr/\b$server\b/);
+        log::l("$server still not running, trying again");
+    }
+    my $nb;
+    my $start_time = time();
+    foreach (1..60) {
+        log::l("waiting for the server to start ($_ $nb)");
+        if (!fuzzy_pidofs(qr/\b$server\b/)) {
+            log::l("Server died");
+            log::l(any::header("Xorg.log"), cat_("/var/log/Xorg.0.log"));
+            return 0 if !fuzzy_pidofs(qr/\b$server\b/);
+	}
+        $nb++ if xf86misc::main::Xtest($wanted_DISPLAY);
+        if ($nb > 2) {         #- one succeeded test is not enough :-(
+            log::l("AFAIK X server is up");
+            return 1;
+        }
+        time() - $start_time < 60 or last;
+        time() - $start_time > 8 and print N("Xorg server is slow to start. Please wait..."), "\n";
+        sleep 1;
+    }
+    log::l("Timeout!!");
+    log::l(any::header("Xorg.log"), cat_("/var/log/Xorg.0.log"));
+    0;
+}
+
 #- if we success to start X in 640x480 using driver "vesa", 
 #- we configure to use fb on installed system (to ensure splashy works)
 #- (useful on 800x480 netbooks)
@@ -176,7 +182,7 @@ sub leavingStep {
 
 sub charsetChanged {
     my ($o) = @_;
-    Gtk2->set_locale;
+    c::init_setlocale();
     install::gtk::load_font($o);
     install::gtk::create_steps_window($o);
 }
@@ -205,7 +211,7 @@ sub selectLanguage {
     $o->ask_warn('',
 formatAlaTeX(N("Your system is low on resources. You may have some problem installing
 %s. If that occurs, you can try a text install instead. For this,
-press `F1' when booting on CDROM, then enter `text'."))) if availableRamMB() < 70; # 70MB
+press `F1' when booting on CDROM, then enter `text'.", N("Mageia")))) if availableRamMB() < 70; # 70MB
 
 }
 
@@ -230,14 +236,22 @@ sub selectMouse {
     } 
 }
 
+sub setPackages {
+    my ($o) = @_;
+    my (undef, $old_title) = get_default_step_items();
+    set_default_step_items(N("Media Selection") || $old_title);
+    install::any::setPackages($o);
+    set_default_step_items($old_title);
+}
+
 sub reallyChooseDesktop {
     my ($o, $title, $message, $choices, $choice) = @_;
 
-    my $w = ugtk2->new($title);
+    my $w = ugtk3->new($title);
 
     my %tips = (
-        KDE    => N("Install %s KDE Desktop"),
-        GNOME  => N("Install %s GNOME Desktop"),
+        KDE    => N("Install %s KDE Desktop", N("Mageia")),
+        GNOME  => N("Install %s GNOME Desktop", N("Mageia")),
         Custom => N("Custom install"),
     );
     my $prev;
@@ -248,15 +262,15 @@ sub reallyChooseDesktop {
                        tip => $tips{$val->[0]},
 		       toggled => sub { $choice = $val if $_[0]->get_active },
                        active => $choice == $val,
-		       $prev ? (group => $prev->get_group) : ());
+		       if_($prev, join => $prev));
 	$prev->signal_connect(key_press_event => sub {
 				  my (undef, $event) = @_;
 				  if (!$event || ($event->keyval & 0x7f) == 0xd) {
-				      Gtk2->main_quit;
+				      Gtk3->main_quit;
 				  }
 			      });
         my $img = gtksignal_connect(
-            gtkadd(Gtk2::EventBox->new, gtknew('Image', file => "desktop-$val->[0]")),
+            gtkadd(Gtk3::EventBox->new, gtknew('Image', file => "desktop-$val->[0]")),
             'button-press-event' => sub {
                 my %title = (
                     KDE    => N("KDE Desktop"),
@@ -264,23 +278,22 @@ sub reallyChooseDesktop {
                     Custom => N("Custom Desktop"),
                 );
 
-                my $wp = ugtk2->new($title{$val->[0]}, transient => $w->{real_window}, modal => 1);
+                my $wp = ugtk3->new($title{$val->[0]}, transient => $w->{real_window}, modal => 1);
                 gtkadd($wp->{rwindow},
-                       gtkpack_(Gtk2::VBox->new,
+                       gtknew('VBox', children => [
                                 0, gtknew('Title2', label => N("Here's a preview of the '%s' desktop.", $val->[1]),
                                           # workaround infamous 6 years old gnome bug #101968:
-                                          width => mygtk2::get_label_width(), 
+                                          width => mygtk3::get_label_width(), 
                                       ),
                                 1, gtknew('Image', file => "desktop-$val->[0]-big"),
-                                0, Gtk2::HSeparator->new,
-                                0, gtkpack(create_hbox('end'),
-                                           gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit })
-                                       ),
-                            ),
+                                0, gtknew('HSeparator'),
+                                0, gtknew('HButtonBox', layout => 'end', children_loose => [
+                                           gtknew('Button', text => N("Close"), clicked => sub { Gtk3->main_quit })
+                                       ]),
+                            ]),
                    );
                 $wp->{real_window}->set_size_request(-1, -1);
                 $wp->{real_window}->grab_focus;
-                $wp->{real_window}->grab_focus;
                 $wp->{real_window}->show_all;
                 $wp->main;
             });
@@ -290,19 +303,17 @@ sub reallyChooseDesktop {
         ]);
     } @$choices;
 
-    ugtk2::gtkadd($w->{window},
+    ugtk3::gtkadd($w->{window},
 	   gtknew('VBox', children => [
 		    0, gtknew('Title2',
                               # workaround infamous 6 years old gnome bug #101968:
-                              width => mygtk2::get_label_width(), label => $message . ' ' .
+                              width => mygtk3::get_label_width(), label => $message . ' ' .
                                 N("Click on images in order to see a bigger preview")),
 		    1, gtknew('HButtonBox', children_loose => \@l),
 		    0, $w->create_okcancel(N("Next"), undef, '',
                                            [ gtknew('Install_Button', text => N("Help"),
                                                     clicked => sub {
-                                                        interactive::gtk::display_help(
-                                                            $o,
-                                                            { interactive_help_id => 'choosePackages#choose-graphical-env' }, $w);
+                                                        interactive::gtk::display_help($o, { interactive_help_id => 'chooseDesktop' });
                                                     }), undef, 1 ])
 		]));
     $w->main;
@@ -313,37 +324,41 @@ sub reallyChooseDesktop {
 sub reallyChooseGroups {
     my ($o, $size_to_display, $individual, $_compssUsers) = @_;
 
-    my $w = ugtk2->new(N("Package Group Selection"));
+    my $w = ugtk3->new(N("Package Group Selection"));
     my $w_size = gtknew('Label_Left', text => &$size_to_display, padding => [ 0, 0 ]);
+    my @entries;
 
     my $entry = sub {
 	my ($e) = @_;
 
-	gtknew('CheckButton', 
+	my $w = gtknew('CheckButton', 
 	       text => translate($e->{label}), 
 	       tip => translate($e->{descr}),
 	       active_ref => \$e->{selected},
 	       toggled => sub { 
 		   gtkset($w_size, text => &$size_to_display);
 	       });
+        push @entries, $w;
+        $w;
     };
     #- when restarting this step, it might be necessary to reload the compssUsers.pl (bug 11558). kludgy.
     if (!ref $o->{gtk_display_compssUsers}) { install::any::load_rate_files($o) }
-    ugtk2::gtkadd($w->{window},
-	   gtknew('VBox', children => [
-		    1, $o->{gtk_display_compssUsers}->($entry),
-		    1, '',
-		    0, if_($individual,
-			      gtknew('CheckButton', text => N("Individual package selection"), active_ref => $individual),
-			  ),
-		    0, $w_size,
-		    0, Gtk2::HSeparator->new,
-		    0, gtknew('HButtonBox', layout => 'edge', children_tight => [
-                        gtknew('Install_Button', text => N("Help"), clicked => sub {
-                                   interactive::gtk::display_help($o, { interactive_help_id => 'choosePackages#choosePackagesGroups' }, $w) }),
-			  gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }),
-			 ]),
-		  ]),
+    ugtk3::gtkadd($w->{window},
+       gtknew('VBox', children => [
+		  1, gtknew('ScrolledWindow', child =>	$o->{gtk_display_compssUsers}->($entry)),
+		  if_($individual,
+		      0, gtknew('CheckButton', text => N("Individual package selection"), active_ref => $individual),
+		  ),
+		  0, $w_size,
+		  0, gtknew('HSeparator'),
+		  0, gtknew('HButtonBox', layout => 'edge', children_tight => [
+				gtknew('Install_Button', text => N("Help"), clicked => sub {
+				    interactive::gtk::display_help($o, { interactive_help_id => 'choosePackageGroups' }) }),
+				gtknew('Button', text => N("Unselect All"), clicked => sub { $_->set_active(0) foreach @entries }),
+				gtknew('Button', text => N("Next"), clicked => sub { Gtk3->main_quit }),
+			    ]),
+	      ],
+          )
 	  );
     $w->main;
     1;
@@ -396,16 +411,17 @@ sub choosePackagesTree {
 			    },
 			    get_info => sub {
 				my $p = install::pkgs::packageByName($packages, $_[0]) or return '';
+				my $description = install::pkgs::get_pkg_info($p);
 
 				my $imp = translate($install::pkgs::compssListDesc{$p->flag_base ? 5 : $p->rate});
 
                                 my $tag = { 'foreground' => 'royalblue3' };
-				$@ ? N("Bad package") :
+				
 				  [ [ N("Name: "), $tag ], [ $p->name . "\n" ],
                                     [ N("Version: "), $tag ], [ $p->version . '-' . $p->release . "\n" ],
                                     [ N("Size: "), $tag ], [ N("%d KB\n", $p->size / 1024) ],
                                     if_($imp, [ N("Importance: "), $tag ], [ "$imp\n" ]),
-                                    [ "\n" ], [ formatLines($p->description) ] ];
+                                    [ "\n" ], [ formatLines($description) ] ];
 			    },
 			    toggle_nodes => sub {
 				my $set_state = shift @_;
@@ -416,6 +432,7 @@ sub choosePackagesTree {
 				my $state = $packages->{state} ||= {};
 				$packages->{rpmdb} ||= install::pkgs::rpmDbOpen(); #- WORKAROUND
 				my @l = $isSelection ? $packages->resolve_requested($packages->{rpmdb}, $state, \%l,
+                                                                                    no_recommends => $::o->{no_recommends},
 										    callback_choices => \&install::pkgs::packageCallbackChoices) :
 						       $packages->disable_selected($packages->{rpmdb}, $state,
 										   map { $packages->{depslist}[$_] } keys %l);
@@ -462,7 +479,8 @@ sub choosePackagesTree {
 				    #- disable selection (or unselection).
 				    $packages->{rpmdb} ||= install::pkgs::rpmDbOpen(); #- WORKAROUND
 				    $isSelection ? $packages->disable_selected($packages->{rpmdb}, $state, @l) :
-				                   $packages->resolve_requested($packages->{rpmdb}, $state, { map { $_->id => 1 } @l });
+				                   $packages->resolve_requested($packages->{rpmdb}, $state, { map { $_->id => 1 } @l },
+                                                                                no_recommends => $::o->{no_recommends});
 				} else {
 				    #- keep the changes, update visible state.
 				    foreach (@l) {
@@ -489,9 +507,7 @@ sub choosePackagesTree {
 			    },
 			    auto_deps => N("Show automatically selected packages"),
 			    interactive_help => sub { 
-                                interactive::gtk::display_help($o,
-                                                               { interactive_help_id => 
-                                                                   'choosePackages#choosePackagesTree' }, my $w) },
+                                interactive::gtk::display_help($o, { interactive_help_id => 'choosePackagesTree' }) },
 
 			    ok => N("Install"),
 			    cancel => N("Previous"),
@@ -532,7 +548,7 @@ sub installPackages {
     my ($current_total_size, $last_size, $nb, $total_size, $last_dtime, $_trans_progress_total);
 
     local $::noborderWhenEmbedded = 1;
-    my $w = ugtk2->new(N("Installing"));
+    my $w = ugtk3->new(N("Installing"));
     state $show_advertising;
     my $show_release_notes;
 
@@ -555,8 +571,8 @@ sub installPackages {
 	    my ($title);
 	    my $pl = $f; $pl =~ s/\.png$/.pl/;
 	    eval(cat_($pl)) if -e $pl;    
-	    $banner->{text} = $title;
-	    Gtk2::Banner::update_text($banner);
+	    # FIXME: This hasn't actually worked for years:
+	    #Gtk3::Banner::update_text($banner, $title);
 	}
     };
 
@@ -568,12 +584,12 @@ sub installPackages {
 			     $pkg_log_widget->{to_bottom}->('force');
 			 });
 
-    my $release_notes = any::get_release_notes($o);
+    state $release_notes ||= any::get_release_notes($o);
     my $rel_notes = gtknew('Button', text => N("Release Notes"), 
                            clicked => sub { $show_release_notes = 1 });
 
-    ugtk2::gtkadd($w->{window}, my $box = gtknew('VBox', children_tight => [ 
-	gtknew('Image_using_pixmap', file_ref => \$advertising_image, show_ref => \$show_advertising),
+    ugtk3::gtkadd($w->{window}, my $box = gtknew('VBox', children_tight => [ 
+	gtknew('Image', file_ref => \$advertising_image, show_ref => \$show_advertising),
     ]));
 
     $box->pack_end(gtkshow(gtknew('VBox', border_width => 7, spacing => 3, children_loose => [
@@ -599,10 +615,6 @@ sub installPackages {
 
     $details->hide if !@install::any::advertising_images;
     $w->sync;
-    foreach ($cancel, $details) {
-	gtkset_mousecursor_normal($_->window);
-    }
-
     $advertize->(0);
 
     local *install::steps::installCallback = sub {
@@ -612,14 +624,9 @@ sub installPackages {
 	    $nb = $amount;
 	    $total_size = $total; $current_total_size = 0;
 	    $o->{install_start_time} = 0;
-	    mygtk2::gtkadd($pkg_log_widget, text => P("%d package", "%d packages", $nb, $nb));
+	    mygtk3::gtkadd($pkg_log_widget, text => P("%d package", "%d packages", $nb, $nb));
 	    $w->flush;
 	} elsif ($type eq 'open') {
-	    gtkval_modify(\$pkg_progress, 0);
-	    my $p = $packages->{depslist}[$id];
-	    mygtk2::gtkadd($pkg_log_widget, text => sprintf("\n%s: %s", $p->name, translate($p->summary)));
-	    $current_total_size += $last_size;
-	    $last_size = $p->size;
 	    $advertize->(1) if $show_advertising && $total_size > 20_000_000 && time() - $change_time > 20;
 
             # display release notes if requested, when not chrooted:
@@ -628,10 +635,17 @@ sub installPackages {
                 any::run_display_release_notes($release_notes);
                 $w->flush;
             }
+	} elsif ($type eq 'inst' && $subtype eq 'start') {
+	    gtkval_modify(\$pkg_progress, 0);
+	    my $p = $packages->{depslist}[$id];
+	    mygtk3::gtkadd($pkg_log_widget, text => sprintf("\n%s: %s", $p->name, translate($p->summary)));
+	    $pkg_log_widget->{to_bottom}->('force');
+	    $current_total_size += $last_size;
+	    $last_size = $p->size;
 
 	    $w->flush;
 	} elsif ($type eq 'inst' && $subtype eq 'progress') {
-	    $o->{install_start_time} = time() unless $o->{install_start_time};
+	    $o->{install_start_time} ||= time();
 	    gtkval_modify(\$pkg_progress, $total ? $amount / $total : 0);
 
 	    my $dtime = time() - $o->{install_start_time};
@@ -667,7 +681,7 @@ sub installPackages {
 sub summary_prompt {
     my ($o, $l, $check_complete) = @_;
 
-    my $w = ugtk2->new(N("Summary"));
+    my $w = ugtk3->new(N("Summary"));
 
     my $set_entry_labels;
     my (@table, @widget_list);
@@ -681,14 +695,14 @@ sub summary_prompt {
 	    $group = $e->{group};
 	    push @table, [ gtknew('HBox', children_tight => [
                 gtknew('Title1', 
-                       label => mygtk2::asteriskize(escape_text_for_TextView_markup_format($group))) ]), '' ];
+                       label => mygtk3::asteriskize(escape_text_for_TextView_markup_format($group))) ]), '' ];
 	}
-	$e->{widget} = gtknew('Label_Right', width => $::real_windowwidth * 0.72, alignment => [ 1, 1 ]);
+	$e->{widget} = gtknew('Label_Right', width => $::real_windowwidth * 0.72, alignment => [ 1, 1 ], line_wrap => 1);
 
 	push @table, [], [ gtknew('HBox', children_tight => [ $e->{widget}, gtknew('Alignment', width => 10) ]),
 			   gtknew('Button', text => N("Configure"), clicked => sub { 
 						 $w->{rwindow}->hide;
-						 my ($old_icon, $old_title) = get_default_step_items();
+						 my ($_old_icon, $old_title) = get_default_step_items();
 						 set_default_step_items($e->{banner_title} || $old_title);
 						 $e->{clicked}(); 
 						 set_default_step_items($old_title);
@@ -711,9 +725,9 @@ sub summary_prompt {
     };
     $set_entry_labels->();
 
-    my $help_sub = sub { interactive::gtk::display_help($o, { interactive_help_id => 'misc-params' }, $w) };
+    my $help_sub = sub { interactive::gtk::display_help($o, { interactive_help_id => 'misc-params' }) };
 
-    ugtk2::gtkadd($w->{window},
+    ugtk3::gtkadd($w->{window},
 	   gtknew('VBox', spacing => 5, children => [
 		    1, gtknew('ScrolledWindow', h_policy => 'never',
 		    child => gtknew('TextView', 
@@ -737,15 +751,15 @@ sub ask_deselect_media__copy_on_disk {
     my %selection = map { $_->{name} => !$_->{ignore} } @$hdlists;
 
     if (@names > 1 || $o_copy_rpms_on_disk) {
-	my $w = ugtk2->new(N("Media Selection"));
+	my $w = ugtk3->new(N("Media Selection"));
 	$w->sync;
-	ugtk2::gtkadd(
+	ugtk3::gtkadd(
 	    $w->{window},
 	    gtknew('VBox', children => [
 	      @names > 1 ? (
 		0, gtknew('Label_Left', padding => [ 0, 0 ],
                               # workaround infamous 6 years old gnome bug #101968:
-                              width => mygtk2::get_label_width(),
+                              width => mygtk3::get_label_width(),
                               text => formatAlaTeX(N("The following installation media have been found.
 If you want to skip some of them, you can unselect them now."))),
 		1, gtknew('ScrolledWindow', child => gtknew('VBox', children => [
@@ -761,17 +775,17 @@ If you want to skip some of them, you can unselect them now."))),
 		if_($o_copy_rpms_on_disk,
 		    0, gtknew('Label_Left', padding => [ 0, 0 ],
                               # workaround infamous 6 years old gnome bug #101968:
-                              width => mygtk2::get_label_width(),
-                              text => N("You have the option to copy the contents of the CDs onto the hard drive before installation.
-It will then continue from the hard drive and the packages will remain available once the system is fully installed.")),
+                              width => mygtk3::get_label_width(),
+                              text => N("You have the option to copy the contents of the CDs onto the hard disk drive before installation.
+It will then continue from the hard disk drive and the packages will remain available once the system is fully installed.")),
 		    0, gtknew('CheckButton', text => N("Copy whole CDs"), active_ref => $o_copy_rpms_on_disk),
 		    1, gtknew('Alignment'),
 		    0, gtknew('HSeparator'),
 		),
 		0, gtknew('HButtonBox', layout => 'edge', children_tight => [
                     gtknew('Install_Button', text => N("Help"), clicked => sub {
-                               interactive::gtk::display_help($o, { interactive_help_id => 'choosePackages' }, $w) }),
-		    gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }),
+                               interactive::gtk::display_help($o, { interactive_help_id => 'choosePackagesTree' }) }),
+		    gtknew('Button', text => N("Next"), clicked => sub { Gtk3->main_quit }),
 		]),
 	    ]),
 	);
@@ -781,4 +795,5 @@ It will then continue from the hard drive and the packages will remain available
     log::l("keeping media " . join ',', map { $_->{rpmsdir} } grep { !$_->{ignore} } @$hdlists);
 }
 
+
 1;
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index b66c1c467..c78535a37 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -1,7 +1,8 @@
-package install::steps_interactive; # $Id: steps_interactive.pm 267011 2010-03-19 12:00:12Z pterjan $
+package install::steps_interactive;
 
 
 use strict;
+use feature 'state';
 
 our @ISA = qw(install::steps);
 
@@ -35,7 +36,7 @@ use log;
 #-######################################################################################
 sub errorInStep {
     my ($o, $err) = @_;
-    $err = ugtk2::escape_text_for_TextView_markup_format($err) if $o->isa('install::steps_gtk');
+    $err = ugtk3::escape_text_for_TextView_markup_format($err) if $o->isa('install::steps_gtk');
     $o->ask_warn(N("Error"), [ N("An error occurred"), formatError($err) ]);
 }
 
@@ -53,7 +54,7 @@ sub acceptLicense {
     my ($o) = @_;
     return if $o->{useless_thing_accepted};
 
-    any::acceptLicense($o, $o->{meta_class} eq 'powerpack');
+    any::acceptLicense($o);
 }
 
 sub selectLanguage {
@@ -130,64 +131,74 @@ sub selectInstallClass {
     my @l = install::any::find_root_parts($o->{fstab}, $::prefix);
     # Don't list other archs as ugrading between archs is not supported
     my $arch = arch() =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch();
-    @l = grep { $_->{arch} eq $arch } @l;
+    # Offer to upgrade only same arch and not mdv-2011+:
+    @l = grep { $_->{arch} eq $arch && $_->{version} !~ /201[1-9]/ } @l;
     if (@l) {
+        _try_to_upgrade($o, @l);
+    }
+}
 
-	log::l("proposing to upgrade partitions " . join(" ", map { $_->{part} && $_->{part}{device} } @l));
+sub _try_to_upgrade {
+    my ($o, @l) = @_;
+    log::l("proposing to upgrade partitions " . join(" ", map { $_->{part} && $_->{part}{device} } @l));
 
-	my @releases = uniq(map { "$_->{release} $_->{version}" } @l);
-	if (@releases != @l) {
-	    #- same release name so adding the device to differentiate them:
-	    $_->{release} .= " ($_->{part}{device})" foreach @l;
-	}
-
-      askInstallClass:
-	my $p;
-	$o->ask_from_({ title => N("Install/Upgrade"),
-			interactive_help_id => 'selectInstallClass',
-		      },
-		      [
-                          { label => N("Is this an install or an upgrade?"), title => 1 },
-                          { val => \$p,
-			  list => [ @l, N_("_: This is a noun:\nInstall") ], 
-			  type => 'list',
-			  format => sub { ref($_[0]) ? N("Upgrade %s", "$_[0]->{release} $_[0]->{version}") : translate($_[0]) }
-			} ]);
-	if (ref $p) {
-	    _check_unsafe_upgrade_and_warn($o, $p->{part}) or $p = undef;
-	}
+    my @releases = uniq(map { "$_->{release} $_->{version}" } @l);
+    if (@releases != @l) {
+        #- same release name so adding the device to differentiate them:
+        $_->{release} .= " ($_->{part}{device})" foreach @l;
+    }
 
-	if (ref $p) {
+  askInstallClass:
+    my $p;
+    $o->ask_from_({ title => N("Install/Upgrade"),
+                    interactive_help_id => 'selectInstallClass',
+                },
+                  [
+                      { label => N("Is this an install or an upgrade?"), title => 1 },
+                      { val => \$p,
+                        list => [ @l, N_("_: This is a noun:\nInstall") ], 
+                        type => 'list',
+                        format => sub { ref($_[0]) ? N("Upgrade %s", "$_[0]->{release} $_[0]->{version}") : translate($_[0]) }
+                    } ]);
+    if (ref $p) {
+        _check_unsafe_upgrade_and_warn($o, $p->{part}) or $p = undef;
+    }
 
-	    if ($p->{part}) {
-		log::l("choosing to upgrade partition $p->{part}{device}");
-		$o->{migrate_device_names} = install::any::use_root_part($o->{all_hds}, $p->{part}, $o);
-	    }
+    if (ref $p) {
+        _prepare_upgrade($o, $p);
+    }
+}
 
-	    #- handle encrypted partitions (esp. /home)
-	    foreach (grep { $_->{mntpoint} } @{$o->{fstab}}) {
-		my ($options, $_unknown) = fs::mount_options::unpack($_);
-		$options->{encrypted} or next;
-		$o->ask_from_({ focus_first => 1 },
-			      [ { label => N("Encryption key for %s", $_->{mntpoint}),
-				  hidden => 1, val => \$_->{encrypt_key} } ]);
-	    }
+sub _prepare_upgrade {
+    my ($o, $p) = @_;
+    if ($p->{part}) {
+        log::l("choosing to upgrade partition $p->{part}{device}");
+        $o->{migrate_device_names} = install::any::use_root_part($o->{all_hds}, $p->{part}, $o);
+    }
 
-	    $o->{previous_release} = $p;
-	    $o->{isUpgrade} = (find { $p->{release_file} =~ /$_/ } 'mageia', 'mandriva', 'mandrake', 'conectiva', 'redhat') || 'unknown';
-	    $o->{upgrade_by_removing_pkgs_matching} ||= {
-		conectiva => 'cl',
-		redhat => '.', #- everything!
-	    }->{$o->{isUpgrade}};
-	    log::l("upgrading $o->{isUpgrade} distribution" . ($o->{upgrade_by_removing_pkgs_matching} ? " (upgrade_by_removing_pkgs_matching $o->{upgrade_by_removing_pkgs_matching})" : ''));
-	}
+    #- handle encrypted partitions (esp. /home)
+    foreach (grep { $_->{mntpoint} } @{$o->{fstab}}) {
+        my ($options, $_unknown) = fs::mount_options::unpack($_);
+        $options->{encrypted} or next;
+        $o->ask_from_({ focus_first => 1 },
+                      [ { label => N("Encryption key for %s", $_->{mntpoint}),
+                          hidden => 1, val => \$_->{encrypt_key} } ]);
     }
+
+    $o->{previous_release} = $p;
+    $o->{isUpgrade} = (find { $p->{release_file} =~ /$_/ } 'mageia', 'mandriva', 'mandrake', 'conectiva', 'redhat') || 'unknown';
+    $o->{upgrade_by_removing_pkgs_matching} ||= {
+        conectiva => 'cl',
+        redhat => '.',          #- everything!
+    }->{$o->{isUpgrade}};
+    log::l("upgrading $o->{isUpgrade} distribution" . ($o->{upgrade_by_removing_pkgs_matching} ? " (upgrade_by_removing_pkgs_matching $o->{upgrade_by_removing_pkgs_matching})" : ''));
 }
 
 sub _check_unsafe_upgrade_and_warn {
     my ($o, $part) = @_;
     !_is_unsafe_upgrade($part) || _warn_unsafe_upgrade($o);
 }
+
 sub _is_unsafe_upgrade {
     my ($part) = @_;
 
@@ -196,6 +207,7 @@ sub _is_unsafe_upgrade {
     log::l("block_size $block_size");
     $block_size == 1024;
 }
+
 sub _warn_unsafe_upgrade {
     my ($o) = @_;
 
@@ -239,7 +251,6 @@ sub selectMouse {
     if ($o->{mouse}{device} eq "input/mice") {
 	modules::interactive::load_category($o, $o->{modules_conf}, 'bus/usb', 1, 0);
 	eval { 
-	    devices::make("usbmouse");
 	    modules::load('usbhid');
 	};
     }
@@ -268,34 +279,6 @@ sub setupSCSI {
 sub doPartitionDisks {
     my ($o) = @_;
 
-    if (arch() =~ /ppc/) {
-	my $generation = detect_devices::get_mac_generation();
-	if ($generation =~ /NewWorld/) {
-	    #- mac partition table
-	    if (defined $partition_table::mac::bootstrap_part) {
-    		#- do not do anything if we've got the bootstrap setup
-    		#- otherwise, go ahead and create one somewhere in the drive free space
-	    } else {
-		my $freepart = $partition_table::mac::freepart;
-		if ($freepart && $freepart->{size} >= 1) {
-		    log::l("creating bootstrap partition on drive /dev/$freepart->{hd}{device}, block $freepart->{start}");
-		    $partition_table::mac::bootstrap_part = $freepart->{part};
-		    log::l("bootstrap now at $partition_table::mac::bootstrap_part");
-		    my $p = { start => $freepart->{start}, size => MB(1), mntpoint => '' };
-		    fs::type::set_pt_type($p, 0x401);
-		    fsedit::add($freepart->{hd}, $p, $o->{all_hds}, { force => 1, primaryOrExtended => 'Primary' });
-		    $partition_table::mac::new_bootstrap = 1;
-
-    		} else {
-		    $o->ask_warn('', N("No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"));
-    		}
-	    }
-	} elsif ($generation =~ /IBM/) {
-	    #- dos partition table
-	    $o->ask_warn('', N("You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"));
-	}
-    }
-
     if (!$o->{isUpgrade}) {
         fs::partitioning_wizard::main($o, $o->{all_hds}, $o->{fstab}, $o->{manualFstab}, $o->{partitions}, $o->{partitioning}, $::local_install);
     }
@@ -335,8 +318,8 @@ If you want to skip some of them, you can unselect them now.")) },
 			    if_($_ eq $names[0], disabled => sub { 1 }),
 			} } @names),
 		  if_($o_copy_rpms_on_disk,
-		    { type => 'label', val => \(formatAlaTeX(N("You have the option to copy the contents of the CDs onto the hard drive before installation.
-It will then continue from the hard drive and the packages will remain available once the system is fully installed."))) },
+		    { type => 'label', val => \(formatAlaTeX(N("You have the option to copy the contents of the CDs onto the hard disk drive before installation.
+It will then continue from the hard disk drive and the packages will remain available once the system is fully installed."))) },
 		    { type => 'bool', text => N("Copy whole CDs"), val => $o_copy_rpms_on_disk },
 		  ),
 		]);
@@ -378,6 +361,7 @@ sub selectSupplMedia {
     my ($o) = @_;
     install::any::selectSupplMedia($o);
 }
+
 #------------------------------------------------------------------------------
 sub choosePackages {
     my ($o) = @_;
@@ -403,7 +387,7 @@ sub choosePackages {
     my ($individual, $chooseGroups);
 
     if (!$o->{isUpgrade}) {
-	my $tasks_ok = install::pkgs::packageByName($o->{packages}, 'task-kde4') &&
+	my $tasks_ok = install::pkgs::packageByName($o->{packages}, 'task-plasma5-minimal') &&
 	               install::pkgs::packageByName($o->{packages}, 'task-gnome-minimal');
 	if ($tasks_ok && $availableC >= 2_500_000_000) { 
 	    _chooseDesktop($o, $o->{rpmsrate_flags_chosen}, \$chooseGroups);
@@ -437,6 +421,7 @@ sub choosePackagesTree {
 			    sort => 1,
 			   });
 }
+
 sub loadSavePackagesOnFloppy {
     my ($o, $packages) = @_;
     $o->ask_from('', 
@@ -462,6 +447,7 @@ The format is the same as auto_install generated files."),
 	install::any::g_default_packages($o);
     }
 }
+
 sub _chooseDesktop {
     my ($o, $rpmsrate_flags_chosen, $chooseGroups) = @_;
 
@@ -476,6 +462,7 @@ sub _chooseDesktop {
     my $default_choice = (find { $rpmsrate_flags_chosen->{"CAT_" . $_->[0]} } @l) || $l[0];
     my $choice = $default_choice;
     if ($o->isa('interactive::gtk')) {
+        # perl_checker: require install::steps_gtk
 	$choice = install::steps_gtk::reallyChooseDesktop($o, $title, $message, \@l, $default_choice);
     } else {
 	$o->ask_from_({ title => $title, message => $message }, [
@@ -496,6 +483,7 @@ sub _chooseDesktop {
 	$$chooseGroups = 1;
     }
 }
+
 sub chooseGroups {
     my ($o, $packages, $compssUsers, $individual) = @_;
 
@@ -563,41 +551,49 @@ sub chooseGroups {
 
     log::l("compssUsersChoice selected: ", join(', ', map { qq("$_->{path}|$_->{label}") } grep { $_->{selected} } @$compssUsers));
 
-    #- do not try to deselect package (by default no groups are selected).
     if (!$o->{isUpgrade}) {
+	#- do not try to deselect package (by default no groups are selected).
 	install::any::unselectMostPackages($o) if $unselect_all;
+
+	#- if no group have been chosen, ask for using base system only, or no X, or normal.
+	if (!any { $_->{selected} } @$compssUsers) {
+	    offer_minimal_options($o) or goto &chooseGroups;
+	}
     }
-    #- if no group have been chosen, ask for using base system only, or no X, or normal.
-    if (!$o->{isUpgrade} && !any { $_->{selected} } @$compssUsers) {
+    1;
+}
+
+sub offer_minimal_options {
+	my ($o) = @_;
 	my $docs = !$o->{excludedocs};	
-	my $minimal;
-	my $suggests;
+	state $minimal;
+	my $recommends = !$o->{no_recommends};
 
 	$o->ask_from_({ title => N("Type of install"), 
-                        message =>N("You have not selected any group of packages.
+                        message => N("You have not selected any group of packages.
 Please choose the minimal installation you want:"),
-                        interactive_help_id => 'choosePackages#minimal-install'
+                        interactive_help_id => 'minimal-install'
                         },
 		     [
 		      { val => \$o->{rpmsrate_flags_chosen}{CAT_X}, type => 'bool', text => N("With X"), disabled => sub { $minimal } },
-		      { val => \$suggests, type => 'bool', text => N("Install suggested packages"), disabled => sub { $minimal } },
+		      { val => \$recommends, type => 'bool', text => N("Install recommended packages"), disabled => sub { $minimal } },
 		      { val => \$docs, type => 'bool', text => N("With basic documentation (recommended!)"), disabled => sub { $minimal } },
 		      { val => \$minimal, type => 'bool', text => N("Truly minimal install (especially no urpmi)") },
 		     ],
-	) or return &chooseGroups;
+	) or return 0;
 
 	if ($minimal) {
-	    $o->{rpmsrate_flags_chosen}{CAT_X} = $docs = $suggests = 0;
+	    $o->{rpmsrate_flags_chosen}{CAT_X} = $docs = $recommends = 0;
 	    $o->{rpmsrate_flags_chosen}{CAT_SYSTEM} = 0;
 	}
 	$o->{excludedocs} = !$docs;
 	$o->{rpmsrate_flags_chosen}{CAT_MINIMAL_DOCS} = $docs;
-	$o->{no_suggests} = !$suggests;
-	$o->{compssListLevel} = pkgs::rpmsrate_rate_max() if !$suggests;
+	$o->{no_recommends} = !$recommends;
+	$o->{compssListLevel} = pkgs::rpmsrate_rate_max() if !$recommends;
+	log::l("install settings: no_recommends=$o->{no_recommends}, excludedocs=$o->{excludedocs}, really_minimal_install=$minimal");
 
 	install::any::unselectMostPackages($o);
-    }
-    1;
+	1;
 }
 
 sub reallyChooseGroups {
@@ -607,7 +603,7 @@ sub reallyChooseGroups {
 
     my ($path, $all);
     $o->ask_from_({ messages => N("Package Group Selection"),
-		    interactive_help_id => 'choosePackages',
+		    interactive_help_id => 'choosePackageGroups',
 		  }, [
         { val => \$size_text, type => 'label' }, {},
 	 (map { 
@@ -632,6 +628,12 @@ sub reallyChooseGroups {
     1;    
 }
 
+sub beforeInstallPackages {
+    my ($o) = @_;
+    my $_w = $o->{isUpgrade} && $o->wait_message('', N("Preparing upgrade..."));
+    $o->SUPER::beforeInstallPackages;
+}
+
 #------------------------------------------------------------------------------
 sub installPackages {
     my ($o) = @_;
@@ -724,7 +726,7 @@ sub configureNetwork {
 #------------------------------------------------------------------------------
 sub installUpdates {
     my ($o) = @_;
-    my $u = $o->{updates} ||= {};
+    $o->{updates} ||= {};
     
     $o->hasNetwork or return;
 
@@ -735,6 +737,36 @@ sub installUpdates {
     }
 
     $o->ask_yesorno_({ title => N("Updates"), messages => formatAlaTeX(
+N("You now have the opportunity to setup online media.") . "\n\n" .
+N("This allows to install security updates.") . "\n\n" .
+N("To setup those media, you will need to have a working Internet 
+connection.
+
+Do you want to setup the update media?")),
+			   interactive_help_id => 'installUpdates',
+					       }, 1) or do {
+	log::l("installUpdates: skipping since user say no to media setup");
+	return;
+    };
+
+    try_again:
+    #- bring all interface up for installing updates packages.
+    install::interactive::upNetwork($o);
+
+    install::pkgs::clean_rpmdb_shared_regions();
+    if (any::urpmi_add_all_media($o, $o->{previous_release})) {
+	log::l("installUpdates: successfully added media");
+    } else {
+	log::l("installUpdates: failed to add media");
+	if ($o->ask_okcancel(N("Warning"),
+		N("Failure when adding medium") . "\n" . N("Retry?"))) {
+	  goto try_again;
+	} else {
+	  return 0;
+	}
+    }
+
+    $o->ask_yesorno_({ title => N("Updates"), messages => formatAlaTeX(
 N("You now have the opportunity to download updated packages. These packages
 have been updated after the distribution was released. They may
 contain security or bug fixes.
@@ -744,17 +776,15 @@ connection.
 
 Do you want to install the updates?")),
 			   interactive_help_id => 'installUpdates',
-					       }, 1) or return;
-
-    #- bring all interface up for installing updates packages.
-    install::interactive::upNetwork($o);
+					       }, 1) or do {
+	log::l("installUpdates: skipping since user say no to updates");
+	return;
+    };
 
-    install::pkgs::clean_rpmdb_shared_regions();
-    if (any::urpmi_add_all_media($o, $o->{previous_release})) {
-	my $binary = find { whereis_binary($_, $::prefix) } 'gurpmi2', 'urpmi' or return;
+	my $binary = find { whereis_binary($_, $::prefix) } if_(check_for_xserver(), 'gurpmi2'), 'urpmi' or return;
 	my $log_file = '/root/drakx/updates.log';
-	run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, '--auto-select', '--update');
-    }
+	run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, '--auto-select');
+
     install::pkgs::clean_rpmdb_shared_regions();
 
     #- not downing network, even ppp. We don't care much since it is the end of install :)
@@ -842,8 +872,10 @@ sub summary {
 	group => N("System"),
 	label => N("Bootloader"),
 	val => sub { 
-	    #-PO: example: lilo-graphic on /dev/hda1
-	    $o->{bootloader}{boot} ? N("%s on %s", $o->{bootloader}{method}, $o->{bootloader}{boot}) : N("None");
+
+	    $o->{bootloader}{boot} ?
+              #-PO: example: lilo-graphic on /dev/hda1
+              N("%s on %s", $o->{bootloader}{method}, $o->{bootloader}{boot}) : N("None");
 	},
 	clicked => sub { 
 	    any::setupBootloader($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) or return;
@@ -855,6 +887,9 @@ sub summary {
 	label => N("User management"),
 	clicked => sub { 
 	    if (my $u = any::ask_user($o, $o->{users}, $o->{security}, needauser => 1)) {
+		#- getpwnam, getgrnam, getgrid works
+		symlinkf("$::prefix/etc/passwd", '/etc/passwd');
+		symlinkf("$::prefix/etc/group", '/etc/group');
 		any::add_users([$u], $o->{authentication});
 	    }
 	},
@@ -937,6 +972,7 @@ sub summary {
 	group => N("Network & Internet"),
 	label => N("Network"),
 	val => sub { $o->{net}{type} },
+	format => sub { $_[0] =~ s/.*:://; $_[0] },
 	clicked => sub { 
 	    require network::netconnect;
 	    network::netconnect::real_main($o->{net}, $o, $o->{modules_conf});
@@ -972,7 +1008,8 @@ sub summary {
              install::any::set_security($o);
          }
 	},
-    };
+    } if -x "$::prefix/usr/sbin/msec";
+    # FIXME: install msec if needed instead
 
     push @l, {
 	group => N("Security"),
@@ -1023,7 +1060,9 @@ sub setRootPassword_addUser {
 sub setupBootloaderBefore {
     my ($o) = @_;
     local $o->{pop_wait_messages} = 1;
-    my $_w = $o->wait_message(N("Preparing bootloader..."), N("Preparing bootloader...") . "\n" .
+    my $_w = $o->wait_message(N("Please wait"),
+			      #-PO: This is NOT the boot loader (just the kernel initrds)!!!!
+			      N("Preparing initial startup program...") . "\n" .
                                 N("Be patient, this may take a while...")
                             );
     $o->SUPER::setupBootloaderBefore;
@@ -1032,14 +1071,6 @@ sub setupBootloaderBefore {
 #------------------------------------------------------------------------------
 sub setupBootloader {
     my ($o) = @_;
-    if (arch() =~ /ppc/) {
-	if (detect_devices::get_mac_generation() !~ /NewWorld/ && 
-	    detect_devices::get_mac_model() !~ /IBM/) {
-	    $o->ask_warn('', N("You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s", '/dev/' . fs::get::root_($o->{fstab})->{device}));
-	    log::l("OldWorld or Unknown Machine - no yaboot setup");
-	    return;
-	}
-    }
     {
 	any::setupBootloader_simple($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) or return;
     }
diff --git a/perl-install/install/steps_list.pm b/perl-install/install/steps_list.pm
index 143ffc354..3dc3de2f2 100644
--- a/perl-install/install/steps_list.pm
+++ b/perl-install/install/steps_list.pm
@@ -35,7 +35,7 @@ use common;
                           N_("User management") ],
   configureNetwork   => [ N_("_: Keep these entry short\nNetworking"), 1, 1, '1', "formatPartitions",
                           N_("_: Keep these entry short\nNetworking") ],
-  setupBootloader    => [ N_("_: Keep these entry short\nBootloader"), 1, 0, '', "installPackages",
+  setupBootloader    => [ N_("_: Keep these entry short\nBootloader"), 1, 0, '1', "installPackages",
                           N_("_: Keep these entry short\nBootloader")  ],
   configureX         => [ N_("_: Keep these entry short\nConfigure X"), 1, 1, '1', ["formatPartitions", "setupBootloader"],
                       N_("_: Keep these entry short\nConfigure X") ],
diff --git a/perl-install/install/steps_stdio.pm b/perl-install/install/steps_stdio.pm
index 0b0850fcb..1cf4b1197 100644
--- a/perl-install/install/steps_stdio.pm
+++ b/perl-install/install/steps_stdio.pm
@@ -1,4 +1,4 @@
-package install::steps_stdio; # $Id: steps_stdio.pm 215411 2007-04-25 12:26:16Z pixel $
+package install::steps_stdio;
 
 use diagnostics;
 use strict;